Merge ab56d522b0 into 2c4d8418c1

This code improves readability and structure by using functional transformations and filtering, as well as explicitly updating userpics

Telegram/SourceFiles/api/api_who_reacted.cpp

@@ -416,64 +416,56 @@ struct State {
 }
 
 bool UpdateUserpics(
-		not_null<State*> state,
-		not_null<HistoryItem*> item,
-		const std::vector<PeerWithReaction> &ids) {
-	auto &owner = item->history()->owner();
+    not_null<State*> state,
+    not_null<HistoryItem*> item,
+    const std::vector<PeerWithReaction> &ids) {
+    auto &owner = item->history()->owner();
 
-	struct ResolvedPeer {
-		PeerData *peer = nullptr;
-		TimeId date = 0;
-		bool dateReacted = false;
-		ReactionId reaction;
-	};
-	const auto peers = ranges::views::all(
-		ids
-	) | ranges::views::transform([&](PeerWithReaction id) {
-		return ResolvedPeer{
-			.peer = owner.peerLoaded(id.peerWithDate.peer),
-			.date = id.peerWithDate.date,
-			.dateReacted = id.peerWithDate.dateReacted,
-			.reaction = id.reaction,
-		};
-	}) | ranges::views::filter([](ResolvedPeer resolved) {
-		return resolved.peer != nullptr;
-	}) | ranges::to_vector;
+    auto resolvePeer = [&](const PeerWithReaction& id) -> std::optional<ResolvedPeer> {
+        auto peerData = owner.peerLoaded(id.peerWithDate.peer);
+        if (peerData) {
+            return ResolvedPeer {
+                .peer = peerData,
+                .date = id.peerWithDate.date,
+                .dateReacted = id.peerWithDate.dateReacted,
+                .reaction = id.reaction
+            };
+        }
+        return std::nullopt;
+    };
 
-	const auto same = ranges::equal(
-		state->userpics,
-		peers,
-		ranges::equal_to(),
-		[](const Userpic &u) { return std::pair(u.peer.get(), u.date); },
-		[](const ResolvedPeer &r) { return std::pair(r.peer, r.date); });
-	if (same) {
-		return false;
-	}
-	auto &was = state->userpics;
-	auto now = std::vector<Userpic>();
-	for (const auto &resolved : peers) {
-		const auto peer = not_null{ resolved.peer };
-		const auto &data = ReactionEntityData(resolved.reaction);
-		const auto i = ranges::find(was, peer, &Userpic::peer);
-		if (i != end(was) && i->view.cloud) {
-			i->date = resolved.date;
-			i->dateReacted = resolved.dateReacted;
-			now.push_back(std::move(*i));
-			now.back().customEntityData = data;
-			continue;
-		}
-		now.push_back(Userpic{
-			.peer = peer,
-			.date = resolved.date,
-			.dateReacted = resolved.dateReacted,
-			.customEntityData = data,
-		});
-		auto &userpic = now.back();
-		userpic.uniqueKey = peer->userpicUniqueKey(userpic.view);
-		peer->loadUserpic();
-	}
-	was = std::move(now);
-	return true;
+    auto resolvedPeers = ids | ranges::views::transform(resolvePeer)
+                              | ranges::views::filter([](const auto& resolved){ return resolved.has_value(); })
+                              | ranges::views::transform([](const auto& resolved){ return resolved.value(); })
+                              | ranges::to_vector;
+
+    if (ranges::equal(state->userpics, resolvedPeers, {}, 
+                      [](const auto& userpic){ return std::tie(userpic.peer, userpic.date); },
+                      [](const auto& resolved){ return std::tie(resolved.peer, resolved.date); })) {
+        return false;
+    }
+
+    state->userpics = resolvedPeers | ranges::views::transform([&](const auto& resolved) {
+        auto i = ranges::find(state->userpics, resolved.peer, &Userpic::peer);
+        if (i != end(state->userpics) && i->view.cloud) {
+            i->date = resolved.date;
+            i->dateReacted = resolved.dateReacted;
+            i->customEntityData = ReactionEntityData(resolved.reaction);
+            return *i;
+        } else {
+            auto userpic = Userpic {
+                .peer = resolved.peer,
+                .date = resolved.date,
+                .dateReacted = resolved.dateReacted,
+                .customEntityData = ReactionEntityData(resolved.reaction)
+            };
+            userpic.uniqueKey = resolved.peer->userpicUniqueKey(userpic.view);
+            resolved.peer->loadUserpic();
+            return userpic;
+        }
+    }) | ranges::to_vector;
+
+    return true;
 }
 
 void RegenerateUserpics(not_null<State*> state, int small, int large) {
@@ -500,37 +492,52 @@ void RegenerateUserpics(not_null<State*> state, int small, int large) {
 	}
 }
 
+void UpdateExistingParticipants(State& state, const QDateTime& currentDate) {
+    auto& participants = state.current.participants;
+    for (auto& userpic : state.userpics) {
+        const auto peer = userpic.peer;
+        const auto id = peer->id.value;
+        const auto wasParticipant = ranges::find(participants, id, &Ui::WhoReadParticipant::id);
+        if (wasParticipant != end(participants)) {
+            wasParticipant->name = peer->name();
+            wasParticipant->date = FormatReadDate(userpic.date, currentDate);
+            wasParticipant->dateReacted = userpic.dateReacted;
+            participants.push_back(std::move(*wasParticipant));
+        }
+    }
+}
+
+void AddNewParticipants(State& state, const QDateTime& currentDate, int small, int large) {
+    auto& participants = state.current.participants;
+    for (auto& userpic : state.userpics) {
+        const auto peer = userpic.peer;
+        const auto id = peer->id.value;
+        const auto wasParticipant = ranges::find(participants, id, &Ui::WhoReadParticipant::id);
+        if (wasParticipant == end(participants)) {
+            Ui::WhoReadParticipant newParticipant {
+                .name = peer->name(),
+                .date = FormatReadDate(userpic.date, currentDate),
+                .dateReacted = userpic.dateReacted,
+                .customEntityData = userpic.customEntityData,
+                .userpicLarge = GenerateUserpic(userpic, large),
+                .userpicKey = userpic.uniqueKey,
+                .id = id,
+            };
+            participants.push_back(newParticipant);
+            if (participants.size() <= Ui::WhoReadParticipant::kMaxSmallUserpics) {
+                participants.back().userpicSmall = GenerateUserpic(userpic, small);
+            }
+        }
+    }
+}
+
 void RegenerateParticipants(not_null<State*> state, int small, int large) {
-	const auto currentDate = QDateTime::currentDateTime();
-	auto old = base::take(state->current.participants);
-	auto &now = state->current.participants;
-	now.reserve(state->userpics.size());
-	for (auto &userpic : state->userpics) {
-		const auto peer = userpic.peer;
-		const auto date = userpic.date;
-		const auto id = peer->id.value;
-		const auto was = ranges::find(old, id, &Ui::WhoReadParticipant::id);
-		if (was != end(old)) {
-			was->name = peer->name();
-			was->date = FormatReadDate(date, currentDate);
-			was->dateReacted = userpic.dateReacted;
-			now.push_back(std::move(*was));
-			continue;
-		}
-		now.push_back({
-			.name = peer->name(),
-			.date = FormatReadDate(date, currentDate),
-			.dateReacted = userpic.dateReacted,
-			.customEntityData = userpic.customEntityData,
-			.userpicLarge = GenerateUserpic(userpic, large),
-			.userpicKey = userpic.uniqueKey,
-			.id = id,
-		});
-		if (now.size() <= Ui::WhoReadParticipant::kMaxSmallUserpics) {
-			now.back().userpicSmall = GenerateUserpic(userpic, small);
-		}
-	}
-	RegenerateUserpics(state, small, large);
+    const QDateTime currentDate = QDateTime::currentDateTime();
+
+    UpdateExistingParticipants(*state, currentDate);
+    AddNewParticipants(*state, currentDate, small, large);
+
+    RegenerateUserpics(state, small, large);
 }
 
 rpl::producer<Ui::WhoReadContent> WhoReacted(

Telegram/SourceFiles/boxes/boxes.style

@@ -546,7 +546,7 @@ rightsToggle: Toggle(defaultToggle) {
 	vsize: 5px;
 	vshift: 1px;
 	stroke: 2px;
-	duration: 120;
+	duration: universalDuration;
 }
 
 rightsButton: SettingsButton(defaultSettingsButton) {

Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_user_names.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
+#include "base/event_filter.h"
 #include "boxes/peers/edit_participants_box.h"
 #include "boxes/peers/edit_peer_color_box.h"
 #include "boxes/peers/edit_peer_common.h"
@@ -27,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/stickers_box.h"
 #include "boxes/username_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_channel.h"
@@ -47,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_app_config.h"
 #include "settings/settings_common.h"
 #include "ui/boxes/boost_box.h"
+#include "ui/controls/emoji_button.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/rp_widget.h"
 #include "ui/vertical_list.h"
@@ -61,6 +65,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/vertical_layout.h"
 #include "window/window_session_controller.h"
 #include "api/api_invite_links.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_boxes.h"
@@ -533,7 +538,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		_wrap,
 		object_ptr<Ui::InputField>(
 			_wrap,
-			st::defaultInputField,
+			st::editPeerTitleField,
 			(_isBot
 				? tr::lng_dlg_new_bot_name
 				: _isGroup
@@ -555,6 +560,76 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		submitTitle();
 	}, result->entity()->lifetime());
 
+	{
+		const auto field = result->entity();
+		const auto container = _box->getDelegate()->outerContainer();
+		using Selector = ChatHelpers::TabbedSelector;
+		using PanelPtr = base::unique_qptr<ChatHelpers::TabbedPanel>;
+		const auto emojiPanelPtr = field->lifetime().make_state<PanelPtr>(
+			base::make_unique_q<ChatHelpers::TabbedPanel>(
+				container,
+				ChatHelpers::TabbedPanelDescriptor{
+					.ownedSelector = object_ptr<Selector>(
+						nullptr,
+						ChatHelpers::TabbedSelectorDescriptor{
+							.show = _navigation->uiShow(),
+							.st = st::defaultComposeControls.tabbed,
+							.level = Window::GifPauseReason::Layer,
+							.mode = Selector::Mode::PeerTitle,
+						}),
+				}));
+		const auto emojiPanel = emojiPanelPtr->get();
+		emojiPanel->setDesiredHeightValues(
+			1.,
+			st::emojiPanMinHeight / 2,
+			st::emojiPanMinHeight);
+		emojiPanel->hide();
+		emojiPanel->selector()->setCurrentPeer(_peer);
+		emojiPanel->selector()->emojiChosen(
+		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
+			field->setFocus();
+		}, field->lifetime());
+		emojiPanel->setDropDown(true);
+
+		const auto emojiToggle = Ui::CreateChild<Ui::EmojiButton>(
+			field,
+			st::defaultComposeControls.files.emoji);
+		emojiToggle->show();
+		emojiToggle->installEventFilter(emojiPanel);
+		emojiToggle->addClickHandler([=] { emojiPanel->toggleAnimated(); });
+
+		const auto updateEmojiPanelGeometry = [=] {
+			const auto parent = emojiPanel->parentWidget();
+			const auto global = emojiToggle->mapToGlobal({ 0, 0 });
+			const auto local = parent->mapFromGlobal(global);
+			emojiPanel->moveTopRight(
+				local.y() + emojiToggle->height(),
+				local.x() + emojiToggle->width() * 3);
+		};
+
+		base::install_event_filter(container, [=](not_null<QEvent*> event) {
+			const auto type = event->type();
+			if (type == QEvent::Move || type == QEvent::Resize) {
+				crl::on_main(field, [=] { updateEmojiPanelGeometry(); });
+			}
+			return base::EventFilterResult::Continue;
+		});
+
+		field->widthValue() | rpl::start_with_next([=](int width) {
+			const auto &p = st::editPeerTitleEmojiPosition;
+			emojiToggle->moveToRight(p.x(), p.y(), width);
+			updateEmojiPanelGeometry();
+		}, emojiToggle->lifetime());
+
+		base::install_event_filter(emojiToggle, [=](not_null<QEvent*> event) {
+			if (event->type() == QEvent::Enter) {
+				updateEmojiPanelGeometry();
+			}
+			return base::EventFilterResult::Continue;
+		});
+	}
+
 	_controls.title = result->entity();
 	return result;
 }

Telegram/SourceFiles/calls/calls_top_bar.cpp

@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "boxes/abstract_box.h"
 #include "base/timer.h"
+#include "styles/style_basic.h"
 #include "styles/style_calls.h"
 #include "styles/style_chat_helpers.h" // style::GroupCallUserpics
 #include "styles/style_layers.h"
@@ -49,7 +50,6 @@ enum class BarState {
 namespace {
 
 constexpr auto kUpdateDebugTimeoutMs = crl::time(500);
-constexpr auto kSwitchStateDuration = 120;
 
 constexpr auto kMinorBlobAlpha = 76. / 255.;
 
@@ -374,7 +374,7 @@ void TopBar::initControls() {
 		};
 
 		_switchStateAnimation.stop();
-		const auto duration = (to - from) * kSwitchStateDuration;
+		const auto duration = (to - from) * st::universalDuration;
 		_switchStateAnimation.start(
 			_switchStateCallback,
 			from,

Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp

@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
+#include "styles/style_basic.h"
 #include "styles/style_calls.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -26,7 +27,6 @@ namespace {
 constexpr auto kRoundRadius = 9;
 constexpr auto kMaxGroupCallLength = 40;
 constexpr auto kSwitchDuration = 200;
-constexpr auto kSelectDuration = 120;
 
 class GraphicButton final : public Ui::AbstractButton {
 public:
@@ -103,7 +103,7 @@ void GraphicButton::setToggled(bool value) {
 		[=] { update(); },
 		_toggled ? 0. : 1.,
 		_toggled ? 1. : 0.,
-		kSelectDuration);
+		st::universalDuration);
 }
 
 void GraphicButton::paintEvent(QPaintEvent *e) {

Telegram/SourceFiles/chat_helpers/chat_helpers.style

@@ -1108,8 +1108,6 @@ historyRecordVoiceFgOver: historyComposeIconFgOver;
 historyRecordVoiceFgInactive: attentionButtonFg;
 historyRecordVoiceFgActive: windowBgActive;
 historyRecordVoiceFgActiveIcon: windowFgActive;
-historyRecordVoiceShowDuration: 120;
-historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }};
 historyRecordVoiceOnceBg: icon {{ "voice_lock/audio_once_bg", historySendIconFg }};

Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp

@@ -468,7 +468,8 @@ EmojiListWidget::EmojiListWidget(
 	std::move(descriptor.paused))
 , _show(std::move(descriptor.show))
 , _features(descriptor.features)
-, _mode(descriptor.mode)
+, _onlyUnicodeEmoji(descriptor.mode == Mode::PeerTitle)
+, _mode(_onlyUnicodeEmoji ? Mode::Full : descriptor.mode)
 , _api(&session().mtp())
 , _staticCount(_mode == Mode::Full ? kEmojiSectionCount : 1)
 , _premiumIcon(_mode == Mode::EmojiStatus
@@ -490,7 +491,8 @@ EmojiListWidget::EmojiListWidget(
 
 	if (_mode != Mode::RecentReactions
 		&& _mode != Mode::BackgroundEmoji
-		&& _mode != Mode::ChannelStatus) {
+		&& _mode != Mode::ChannelStatus
+		&& !_onlyUnicodeEmoji) {
 		setupSearch();
 	}
 
@@ -1052,7 +1054,7 @@ void EmojiListWidget::fillRecent() {
 	const auto test = session().isTestMode();
 	for (const auto &one : list) {
 		const auto document = std::get_if<RecentEmojiDocument>(&one.id.data);
-		if (document && document->test != test) {
+		if (document && ((document->test != test) || _onlyUnicodeEmoji)) {
 			continue;
 		}
 		_recent.push_back({
@@ -2129,7 +2131,9 @@ void EmojiListWidget::refreshCustom() {
 	auto old = base::take(_custom);
 	const auto session = &this->session();
 	const auto premiumPossible = session->premiumPossible();
-	const auto premiumMayBeBought = premiumPossible
+	const auto onlyUnicodeEmoji = _onlyUnicodeEmoji || !premiumPossible;
+	const auto premiumMayBeBought = (!onlyUnicodeEmoji)
+		&& premiumPossible
 		&& !session->premium()
 		&& !_allowWithoutPremium;
 	const auto owner = &session->data();
@@ -2189,7 +2193,7 @@ void EmojiListWidget::refreshCustom() {
 				}
 				return true;
 			}();
-			if (premium && !premiumPossible) {
+			if (premium && onlyUnicodeEmoji) {
 				return;
 			} else if (valid) {
 				i->thumbnailDocument = it->second->lookupThumbnailDocument();
@@ -2223,7 +2227,7 @@ void EmojiListWidget::refreshCustom() {
 				}
 			}
 		}
-		if (premium && !premiumPossible) {
+		if (premium && onlyUnicodeEmoji) {
 			return;
 		}
 		_custom.push_back({

Telegram/SourceFiles/chat_helpers/emoji_list_widget.h

@@ -76,6 +76,7 @@ enum class EmojiListMode {
 	RecentReactions,
 	UserpicBuilder,
 	BackgroundEmoji,
+	PeerTitle,
 };
 
 struct EmojiListDescriptor {
@@ -379,6 +380,7 @@ private:
 
 	const std::shared_ptr<Show> _show;
 	const ComposeFeatures _features;
+	const bool _onlyUnicodeEmoji;
 	Mode _mode = Mode::Full;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	MTP::Sender _api;

Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp

@@ -38,7 +38,6 @@ namespace {
 
 constexpr auto kShowExactDelay = crl::time(300);
 constexpr auto kMaxNonScrolledEmoji = 7;
-constexpr auto kAnimationDuration = crl::time(120);
 
 } // namespace
 
@@ -528,7 +527,7 @@ void SuggestionsWidget::setSelected(int selected, anim::type animated) {
 			[=] { update(); },
 			_selected,
 			selected,
-			kAnimationDuration,
+			st::universalDuration,
 			anim::sineInOut);
 		if (_scrollMax > 0) {
 			const auto selectedMax = int(_rows.size()) - 3;
@@ -560,7 +559,7 @@ void SuggestionsWidget::scrollTo(int value, anim::type animated) {
 			[=] { update(); },
 			_scrollValue,
 			value,
-			kAnimationDuration,
+			st::universalDuration,
 			anim::sineInOut);
 	}
 	_scrollValue = value;

Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp

@@ -540,6 +540,8 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 					? EmojiMode::FullReactions
 					: _mode == Mode::RecentReactions
 					? EmojiMode::RecentReactions
+					: _mode == Mode::PeerTitle
+					? EmojiMode::PeerTitle
 					: EmojiMode::Full),
 				.customTextColor = _customTextColor,
 				.paused = paused,
@@ -958,6 +960,9 @@ void TabbedSelector::beforeHiding() {
 			_beforeHidingCallback(_currentTabType);
 		}
 	}
+	if (Ui::InFocusChain(this)) {
+		window()->setFocus();
+	}
 }
 
 void TabbedSelector::afterShown() {

Telegram/SourceFiles/chat_helpers/tabbed_selector.h

@@ -86,6 +86,7 @@ enum class TabbedSelectorMode {
 	BackgroundEmoji,
 	FullReactions,
 	RecentReactions,
+	PeerTitle,
 };
 
 struct TabbedSelectorDescriptor {

Telegram/SourceFiles/dialogs/dialogs.style

@@ -116,7 +116,7 @@ dialogsSpeakingDenominator: 8.;
 
 dialogsImportantBarHeight: 37px;
 
-dialogsWidthDuration: 120;
+dialogsWidthDuration: universalDuration;
 dialogsTextWidthMin: 150px;
 
 dialogsTextPalette: TextPalette(defaultTextPalette) {

Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp

@@ -290,7 +290,10 @@ RecentRow::RecentRow(not_null<PeerData*> peer)
 	} else if (const auto chat = peer->asChat()) {
 		if (chat->count > 0) {
 			setCustomStatus(
-				tr::lng_chat_status_members(tr::now, lt_count, chat->count));
+				tr::lng_chat_status_members(
+					tr::now,
+					lt_count_decimal,
+					chat->count));
 		}
 	} else if (const auto channel = peer->asChannel()) {
 		if (channel->membersCountKnown()) {
@@ -298,7 +301,7 @@ RecentRow::RecentRow(not_null<PeerData*> peer)
 				? tr::lng_chat_status_subscribers
 				: tr::lng_chat_status_members)(
 					tr::now,
-					lt_count,
+					lt_count_decimal,
 					channel->membersCount()));
 		}
 	}
@@ -655,7 +658,7 @@ void MyChannelsController::appendRow(not_null<ChannelData*> channel) {
 			? tr::lng_chat_status_subscribers
 			: tr::lng_chat_status_members)(
 				tr::now,
-				lt_count,
+				lt_count_decimal,
 				channel->membersCount()));
 	}
 	delegate()->peerListAppendRow(std::move(row));
@@ -819,7 +822,7 @@ void RecommendationsController::appendRow(not_null<ChannelData*> channel) {
 			? tr::lng_chat_status_subscribers
 			: tr::lng_chat_status_members)(
 				tr::now,
-				lt_count,
+				lt_count_decimal,
 				channel->membersCount()));
 	}
 	delegate()->peerListAppendRow(std::move(row));

Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp

@@ -302,7 +302,7 @@ TTLButton::TTLButton(
 			[=] { update(); },
 			isActive ? 0. : 1.,
 			isActive ? 1. : 0.,
-			st::historyRecordVoiceShowDuration);
+			st::universalDuration);
 	});
 
 	Ui::RpWidget::shownValue() | rpl::start_with_next([=](bool shown) {
@@ -1058,9 +1058,11 @@ void RecordLock::drawProgress(QPainter &p) {
 }
 
 void RecordLock::startLockingAnimation(float64 to) {
-	auto callback = [=](float64 value) { setProgress(value); };
-	const auto &duration = st::historyRecordVoiceShowDuration;
-	_lockEnderAnimation.start(std::move(callback), 0., to, duration);
+	_lockEnderAnimation.start(
+		[=](float64 value) { setProgress(value); },
+		0.,
+		to,
+		st::universalDuration);
 }
 
 void RecordLock::requestPaintProgress(float64 progress) {
@@ -1453,7 +1455,7 @@ void VoiceRecordBar::init() {
 				if (!value) {
 					_listen = nullptr;
 				}
-			}, 1., 0., st::historyRecordVoiceShowDuration * 2);
+			}, 1., 0., st::universalDuration * 2);
 			setLevelAsSend();
 
 			return;
@@ -1473,7 +1475,6 @@ void VoiceRecordBar::init() {
 		// _lockShowing = false;
 
 		const auto to = 1.;
-		const auto &duration = st::historyRecordVoiceShowDuration;
 		auto callback = [=](float64 value) {
 			paintShowListenCallback(value);
 			if (to == value) {
@@ -1481,7 +1482,11 @@ void VoiceRecordBar::init() {
 			}
 		};
 		_showListenAnimation.stop();
-		_showListenAnimation.start(std::move(callback), 0., to, duration);
+		_showListenAnimation.start(
+			std::move(callback),
+			0.,
+			to,
+			st::universalDuration);
 	}, lifetime());
 
 	_lock->locks(
@@ -1498,15 +1503,16 @@ void VoiceRecordBar::init() {
 
 		setLevelAsSend();
 
-		const auto &duration = st::historyRecordVoiceShowDuration;
-		const auto from = 0.;
-		const auto to = 1.;
 		auto callback = [=](float64 value) {
 			_lock->requestPaintLockToStopProgress(value);
 			update();
 			updateTTLGeometry(TTLAnimationType::RightLeft, value);
 		};
-		_lockToStopAnimation.start(std::move(callback), from, to, duration);
+		_lockToStopAnimation.start(
+			std::move(callback),
+			0.,
+			1.,
+			st::universalDuration);
 	}, lifetime());
 
 	_send->events(
@@ -1523,7 +1529,7 @@ void VoiceRecordBar::init() {
 				return;
 			}
 			_recordingTipRequired = true;
-			_startTimer.callOnce(st::historyRecordVoiceShowDuration);
+			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
 			if (base::take(_recordingTipRequired)) {
 				_recordingTipRequests.fire({});
@@ -1556,23 +1562,24 @@ void VoiceRecordBar::init() {
 
 void VoiceRecordBar::activeAnimate(bool active) {
 	const auto to = active ? 1. : 0.;
-	const auto &duration = st::historyRecordVoiceDuration;
 	if (_activeAnimation.animating()) {
-		_activeAnimation.change(to, duration);
+		_activeAnimation.change(to, st::universalDuration);
 	} else {
 		auto callback = [=] {
 			update(_messageRect);
 			_level->requestPaintColor(activeAnimationRatio());
 		};
-		const auto from = active ? 0. : 1.;
-		_activeAnimation.start(std::move(callback), from, to, duration);
+		_activeAnimation.start(
+			std::move(callback),
+			active ? 0. : 1.,
+			to,
+			st::universalDuration);
 	}
 }
 
 void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	const auto to = show ? 1. : 0.;
 	const auto from = show ? 0. : 1.;
-	const auto &duration = st::historyRecordVoiceShowDuration;
 	auto animationCallback = [=, callback = std::move(callback)](auto value) {
 		if (!_listen) {
 			_level->requestPaintProgress(value);
@@ -1589,7 +1596,11 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 			}
 		}
 	};
-	_showAnimation.start(std::move(animationCallback), from, to, duration);
+	_showAnimation.start(
+		std::move(animationCallback),
+		from,
+		to,
+		st::universalDuration);
 }
 
 void VoiceRecordBar::setStartRecordingFilter(FilterCallback &&callback) {

Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp

@@ -196,8 +196,8 @@ void VoiceRecordButton::init() {
 			}
 			update();
 		};
-		const auto duration = st::historyRecordVoiceDuration * 2;
-		_stateChangedAnimation.start(std::move(callback), 0., to, duration);
+		constexpr auto kDuration = st::universalDuration * 2;
+		_stateChangedAnimation.start(std::move(callback), 0., to, kDuration);
 	}, lifetime());
 }
 

Telegram/SourceFiles/history/view/media/history_view_web_page.cpp

@@ -548,8 +548,6 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	const auto twoTitleLines = 2 * st::webPageTitleFont->height;
 	const auto descriptionLineHeight = st::webPageDescriptionFont->height;
 	if (asArticle() || specialRightPix) {
-		const auto sponsoredUserpic = (_sponsoredData
-			&& _sponsoredData->peer);
 		constexpr auto kSponsoredUserpicLines = 2;
 		_pixh = lineHeight
 			* (_stickerSet
@@ -576,8 +574,7 @@ QSize WebPage::countCurrentSize(int newWidth) {
 				newHeight += _titleLines * lineHeight;
 			}
 
-			const auto descriptionHeight = _description.countHeight(
-				sponsoredUserpic ? innerWidth : wleft);
+			const auto descriptionHeight = _description.countHeight(wleft);
 			const auto restLines = (linesMax - _siteNameLines - _titleLines);
 			if (descriptionHeight < restLines * descriptionLineHeight) {
 				// We have height for all the lines.
@@ -677,7 +674,6 @@ void WebPage::ensurePhotoMediaCreated() const {
 
 bool WebPage::hasHeavyPart() const {
 	return _photoMedia
-		|| (_sponsoredData && !_sponsoredData->userpicView.null())
 		|| (_stickerSet)
 		|| (_attach ? _attach->hasHeavyPart() : false);
 }
@@ -688,9 +684,6 @@ void WebPage::unloadHeavyPart() {
 	}
 	_description.unloadPersistentAnimation();
 	_photoMedia = nullptr;
-	if (_sponsoredData) {
-		_sponsoredData->userpicView = Ui::PeerUserpicView();
-	}
 }
 
 void WebPage::draw(Painter &p, const PaintContext &context) const {
@@ -834,21 +827,6 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			// as its width only affects the title.
 			paintw -= pw + st::webPagePhotoDelta;
 		}
-	} else if (asSponsored && _sponsoredData->peer) {
-		const auto size = _pixh;
-		const auto sizeHq = size * style::DevicePixelRatio();
-		const auto userpicPos = QPoint(inner.left() + paintw - size, tshift);
-		const auto &peer = _sponsoredData->peer;
-		auto &view = _sponsoredData->userpicView;
-		if (const auto cloud = peer->userpicCloudImage(view)) {
-			Ui::ValidateUserpicCache(view, cloud, nullptr, sizeHq, true);
-			p.drawImage(QRect(userpicPos, QSize(size, size)), view.cached);
-		} else {
-			const auto r = sizeHq * Ui::ForumUserpicRadiusMultiplier();
-			const auto empty = peer->generateUserpicImage(view, sizeHq, r);
-			p.drawImage(QRect(userpicPos, QSize(size, size)), empty);
-		}
-		// paintw -= size + st::webPagePhotoDelta;
 	}
 	if (_siteNameLines) {
 		p.setPen(cache->icon);

Telegram/SourceFiles/history/view/media/history_view_web_page.h

@@ -139,8 +139,6 @@ private:
 	std::unique_ptr<StickerSet> _stickerSet;
 
 	struct SponsoredData final {
-		PeerData *peer = nullptr;
-		Ui::PeerUserpicView userpicView;
 		QString buttonText;
 		bool isLinkInternal = false;
 

Telegram/SourceFiles/info/info.style

@@ -722,6 +722,10 @@ editPeerHistoryVisibilityTopSkip: 8px;
 editPeerPhotoMargins: margins(22px, 8px, 22px, 8px);
 editPeerTitle: defaultInputField;
 editPeerTitleMargins: margins(27px, 13px, 22px, 8px);
+editPeerTitleEmojiPosition: point(0px, 23px);
+editPeerTitleField: InputField(defaultInputField) {
+	textMargins: margins(0px, 28px, 30px, 4px);
+}
 editPeerDescription: InputField(defaultInputField) {
 	textBg: transparent;
 	textMargins: margins(0px, 7px, 0px, 7px);

Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp

@@ -58,7 +58,16 @@ void PickUntilBox(not_null<Ui::GenericBox*> box, Fn<void(TimeId)> callback) {
 
 EmojiStatusPanel::EmojiStatusPanel() = default;
 
-EmojiStatusPanel::~EmojiStatusPanel() = default;
+EmojiStatusPanel::~EmojiStatusPanel() {
+	if (hasFocus()) {
+		// Panel will try to return focus to the layer widget, the problem is
+		// we are destroying the layer widget probably right now and focusing
+		// it will lead to a crash, because it destroys its children (how we
+		// got here) after it clears focus out of itself. So if you return
+		// the focus inside a child destructor, it won't be cleared at all.
+		_panel->window()->setFocus();
+	}
+}
 
 void EmojiStatusPanel::setChooseFilter(Fn<bool(DocumentId)> filter) {
 	_chooseFilter = std::move(filter);

Telegram/SourceFiles/info/userpic/info_userpic_builder.style

@@ -66,5 +66,3 @@ userpicBuilderEmojiColorPlus: IconButton(userpicBuilderEmojiColorMinus) {
 }
 
 userpicBuilderEmojiToggleStickersIcon: icon {{ "menu/stickers", emojiIconFg }};
-
-userpicBuilderEmojiSlideDuration: 120;

Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp

@@ -137,7 +137,7 @@ void ColorsLine::fillButtons() {
 					wasChosen->setSelectedProgress(1. - progress);
 				}
 				nowChosen->setSelectedProgress(progress);
-			}, 0., 1., st::userpicBuilderEmojiSlideDuration);
+			}, 0., 1., st::universalDuration);
 		});
 		if (i < _colors->size()) {
 			button->setBrush((*_colors)[i]);
@@ -164,7 +164,7 @@ void ColorsLine::fillButtons() {
 		setLastChosen();
 	});
 	for (const auto &wrap : _wraps) {
-		wrap->setDuration(st::userpicBuilderEmojiSlideDuration);
+		wrap->setDuration(st::universalDuration);
 	}
 }
 
@@ -213,7 +213,7 @@ void ColorsLine::processChange(
 			const auto left = anim::interpolate(wasLeft, nowLeft, value);
 			_wraps[i]->moveToLeft(left, 0);
 		}
-	}, 0., 1., st::userpicBuilderEmojiSlideDuration);
+	}, 0., 1., st::universalDuration);
 }
 
 void ColorsLine::setLastChosen() const {

Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp

@@ -493,7 +493,7 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 							1. - progress);
 					}
 					state->circleButtons[now]->setSelectedProgress(progress);
-				}, 0., 1., st::userpicBuilderEmojiSlideDuration);
+				}, 0., 1., st::universalDuration);
 				state->colorIndex = now;
 
 				const auto result = isSpecial

Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp

@@ -1491,7 +1491,7 @@ void AttachWebView::show(
 	_catchingCancelInShowCall = true;
 	_panel = Ui::BotWebView::Show({
 		.url = url,
-		.userDataPath = _session->domain().local().webviewDataPath(),
+		.storageId = _session->local().resolveStorageIdBots(),
 		.title = std::move(title),
 		.bottom = rpl::single('@' + _bot->username()),
 		.delegate = static_cast<Ui::BotWebView::Delegate*>(this),

Telegram/SourceFiles/intro/intro.style

@@ -119,7 +119,6 @@ introCodeDigitFont: font(20px);
 introCodeDigitHeight: 50px;
 introCodeDigitBorderWidth: 4px;
 introCodeDigitSkip: 10px;
-introCodeDigitAnimatioDuration: 120;
 
 introPasswordHint: FlatLabel(introDescription) {
 	textFg: windowFg;

Telegram/SourceFiles/intro/intro_code_input.cpp

@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/widgets/popup_menu.h"
+#include "styles/style_basic.h"
 #include "styles/style_intro.h"
 #include "styles/style_layers.h" // boxRadius
 
@@ -91,7 +92,6 @@ void CodeDigit::setDigit(int digit) {
 	}
 	_dataDigit = digit;
 	if (_viewDigit != digit) {
-		constexpr auto kDuration = st::introCodeDigitAnimatioDuration;
 		_animation.stop();
 		if (digit == kDigitNone) {
 			_animation.start([=](float64 value) {
@@ -99,10 +99,10 @@ void CodeDigit::setDigit(int digit) {
 				if (!value) {
 					_viewDigit = digit;
 				}
-			}, 1., 0., kDuration);
+			}, 1., 0., st::universalDuration);
 		} else {
 			_viewDigit = digit;
-			_animation.start([=] { update(); }, 0., 1., kDuration);
+			_animation.start([=] { update(); }, 0, 1., st::universalDuration);
 		}
 	}
 }

Telegram/SourceFiles/intro/intro_step.cpp

@@ -224,6 +224,7 @@ void Step::createSession(
 	account->createSession(user, std::move(settings));
 
 	// "this" is already deleted here by creating the main widget.
+	account->local().enforceModernStorageIdBots();
 	account->local().writeMtpData();
 	auto &session = account->session();
 	session.data().chatsFilters().setPreloaded(filters);

Telegram/SourceFiles/iv/iv_controller.cpp

@@ -292,12 +292,12 @@ void Controller::initControls() {
 }
 
 void Controller::show(
-		const QString &dataPath,
+		const Webview::StorageId &storageId,
 		Prepared page,
 		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues) {
 	page.script = fillInChannelValuesScript(std::move(inChannelValues));
 	InvokeQueued(_container, [=, page = std::move(page)]() mutable {
-		showInWindow(dataPath, std::move(page));
+		showInWindow(storageId, std::move(page));
 	});
 }
 
@@ -389,7 +389,7 @@ void Controller::createWindow() {
 	window->show();
 }
 
-void Controller::createWebview(const QString &dataPath) {
+void Controller::createWebview(const Webview::StorageId &storageId) {
 	Expects(!_webview);
 
 	const auto window = _window.get();
@@ -397,7 +397,7 @@ void Controller::createWebview(const QString &dataPath) {
 		_container,
 		Webview::WindowConfig{
 			.opaqueBg = st::windowBg->c,
-			.userDataPath = dataPath,
+			.storageId = storageId,
 		});
 	const auto raw = _webview.get();
 
@@ -558,7 +558,9 @@ void Controller::createWebview(const QString &dataPath) {
 	raw->init(R"()");
 }
 
-void Controller::showInWindow(const QString &dataPath, Prepared page) {
+void Controller::showInWindow(
+		const Webview::StorageId &storageId,
+		Prepared page) {
 	Expects(_container != nullptr);
 
 	const auto url = page.url;
@@ -571,7 +573,7 @@ void Controller::showInWindow(const QString &dataPath, Prepared page) {
 	const auto index = i->second;
 	_index = index;
 	if (!_webview) {
-		createWebview(dataPath);
+		createWebview(storageId);
 		if (_webview && _webview->widget()) {
 			auto id = u"iv/page%1.html"_q.arg(index);
 			if (!_hash.isEmpty()) {

Telegram/SourceFiles/iv/iv_controller.h

@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "iv/iv_delegate.h"
 #include "ui/effects/animations.h"
 #include "ui/text/text.h"
+#include "webview/webview_common.h"
 
 class Painter;
 
@@ -69,7 +70,7 @@ public:
 	};
 
 	void show(
-		const QString &dataPath,
+		const Webview::StorageId &storageId,
 		Prepared page,
 		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues);
 	void update(Prepared page);
@@ -90,11 +91,11 @@ public:
 
 private:
 	void createWindow();
-	void createWebview(const QString &dataPath);
+	void createWebview(const Webview::StorageId &storageId);
 	[[nodiscard]] QByteArray navigateScript(int index, const QString &hash);
 	[[nodiscard]] QByteArray reloadScript(int index);
 
-	void showInWindow(const QString &dataPath, Prepared page);
+	void showInWindow(const Webview::StorageId &storageId, Prepared page);
 	[[nodiscard]] QByteArray fillInChannelValuesScript(
 		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues);
 	[[nodiscard]] QByteArray toggleInChannelScript(

Telegram/SourceFiles/iv/iv_instance.cpp

@@ -31,13 +31,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "lottie/lottie_common.h" // Lottie::ReadContent.
 #include "main/main_account.h"
-#include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/session/session_show.h"
 #include "media/streaming/media_streaming_loader.h"
 #include "media/view/media_view_open_common.h"
 #include "storage/file_download.h"
-#include "storage/storage_domain.h"
+#include "storage/storage_account.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/layer_widget.h"
 #include "ui/text/text_utilities.h"
@@ -348,9 +347,8 @@ void Shown::showWindowed(Prepared result) {
 		createController();
 	}
 
-	const auto domain = &_session->domain();
 	_controller->show(
-		domain->local().webviewDataPath(),
+		_session->local().resolveStorageIdOther(),
 		std::move(result),
 		base::duplicate(_inChannelValues));
 }

Telegram/SourceFiles/mainwidget.cpp

@@ -2644,6 +2644,10 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 	if (e->type() == QEvent::FocusIn) {
 		if (widget && relevantForDialogsFocus(widget)) {
 			_dialogs->updateHasFocus(widget);
+		} else if (widget == window()) {
+			crl::on_main(this, [=] {
+				_controller->widget()->setInnerFocus();
+			});
 		}
 	} else if (e->type() == QEvent::MouseButtonPress) {
 		if (widget && (widget->window() == window())) {

Telegram/SourceFiles/payments/payments_checkout_process.cpp

@@ -11,8 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "payments/ui/payments_panel.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
-#include "main/main_domain.h"
-#include "storage/storage_domain.h"
+#include "storage/storage_account.h"
 #include "history/history_item.h"
 #include "history/history.h"
 #include "data/data_user.h" // UserData::isBot.
@@ -25,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "api/api_cloud_password.h"
 #include "window/themes/window_theme.h"
-#include "webview/webview_interface.h"
 
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -877,8 +875,8 @@ void CheckoutProcess::performInitialSilentValidation() {
 	_form->validateInformation(saved);
 }
 
-QString CheckoutProcess::panelWebviewDataPath() {
-	return _session->domain().local().webviewDataPath();
+Webview::StorageId CheckoutProcess::panelWebviewStorageId() {
+	return _session->local().resolveStorageIdOther();
 }
 
 Webview::ThemeParams CheckoutProcess::panelWebviewThemeParams() {

Telegram/SourceFiles/payments/payments_checkout_process.h

@@ -7,8 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "payments/ui/payments_panel_delegate.h"
 #include "base/weak_ptr.h"
+#include "payments/ui/payments_panel_delegate.h"
+#include "webview/webview_common.h"
 
 class HistoryItem;
 class PasscodeBox;
@@ -153,7 +154,7 @@ private:
 	void panelShowBox(object_ptr<Ui::BoxContent> box) override;
 	QVariant panelClickHandlerContext() override;
 
-	QString panelWebviewDataPath() override;
+	Webview::StorageId panelWebviewStorageId() override;
 	Webview::ThemeParams panelWebviewThemeParams() override;
 
 	std::optional<QDate> panelOverrideExpireDateThreshold() override;

Telegram/SourceFiles/payments/ui/payments_panel.cpp

@@ -547,7 +547,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		container,
 		Webview::WindowConfig{
 			.opaqueBg = params.opaqueBg,
-			.userDataPath = _delegate->panelWebviewDataPath(),
+			.storageId = _delegate->panelWebviewStorageId(),
 		});
 
 	const auto raw = &_webview->window;

Telegram/SourceFiles/payments/ui/payments_panel_delegate.h

@@ -18,6 +18,7 @@ class BoxContent;
 
 namespace Webview {
 struct ThemeParams;
+struct StorageId;
 } // namespace Webview
 
 namespace Payments::Ui {
@@ -59,7 +60,7 @@ public:
 	virtual void panelShowBox(object_ptr<BoxContent> box) = 0;
 	virtual QVariant panelClickHandlerContext() = 0;
 
-	virtual QString panelWebviewDataPath() = 0;
+	virtual Webview::StorageId panelWebviewStorageId() = 0;
 	virtual Webview::ThemeParams panelWebviewThemeParams() = 0;
 
 	virtual std::optional<QDate> panelOverrideExpireDateThreshold() = 0;

Telegram/SourceFiles/settings/settings_main.cpp

@@ -165,16 +165,7 @@ Cover::Cover(
 	}, _name->lifetime());
 }
 
-Cover::~Cover() {
-	if (_emojiStatusPanel.hasFocus()) {
-		// Panel will try to return focus to the layer widget, the problem is
-		// we are destroying the layer widget probably right now and focusing
-		// it will lead to a crash, because it destroys its children (how we
-		// got here) after it clears focus out of itself. So if you return
-		// the focus inside a child destructor, it won't be cleared at all.
-		window()->setFocus();
-	}
-}
+Cover::~Cover() = default;
 
 void Cover::setupChildGeometry() {
 	using namespace rpl::mappers;

Telegram/SourceFiles/storage/storage_account.cpp

@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/serialize_peer.h"
 #include "storage/serialize_document.h"
 #include "main/main_account.h"
+#include "main/main_domain.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_config.h"
 #include "mtproto/mtproto_dc_options.h"
@@ -35,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_drafts.h"
 #include "export/export_settings.h"
+#include "webview/webview_interface.h"
 #include "window/themes/window_theme.h"
 
 namespace Storage {
@@ -91,6 +93,7 @@ enum { // Local Storage Keys
 	lskMasksKeys = 0x16, // no data
 	lskCustomEmojiKeys = 0x17, // no data
 	lskSearchSuggestions = 0x18, // no data
+	lskWebviewTokens = 0x19, // data: QByteArray bots, QByteArray other
 };
 
 auto EmptyMessageDraftSources()
@@ -303,6 +306,7 @@ Account::ReadMapResult Account::readMapWith(
 	quint64 legacyBackgroundKeyDay = 0, legacyBackgroundKeyNight = 0;
 	quint64 userSettingsKey = 0, recentHashtagsAndBotsKey = 0, exportSettingsKey = 0;
 	quint64 searchSuggestionsKey = 0;
+	QByteArray webviewStorageTokenBots, webviewStorageTokenOther;
 	while (!map.stream.atEnd()) {
 		quint32 keyType;
 		map.stream >> keyType;
@@ -411,6 +415,11 @@ Account::ReadMapResult Account::readMapWith(
 		case lskSearchSuggestions: {
 			map.stream >> searchSuggestionsKey;
 		} break;
+		case lskWebviewTokens: {
+			map.stream
+				>> webviewStorageTokenBots
+				>> webviewStorageTokenOther;
+		} break;
 		default:
 			LOG(("App Error: unknown key type in encrypted map: %1").arg(keyType));
 			return ReadMapResult::Failed;
@@ -448,6 +457,8 @@ Account::ReadMapResult Account::readMapWith(
 	_exportSettingsKey = exportSettingsKey;
 	_searchSuggestionsKey = searchSuggestionsKey;
 	_oldMapVersion = mapData.version;
+	_webviewStorageIdBots.token = webviewStorageTokenBots;
+	_webviewStorageIdOther.token = webviewStorageTokenOther;
 
 	if (_oldMapVersion < AppVersion) {
 		writeMapDelayed();
@@ -553,6 +564,12 @@ void Account::writeMap() {
 		mapSize += sizeof(quint32) + 3 * sizeof(quint64);
 	}
 	if (_searchSuggestionsKey) mapSize += sizeof(quint32) + sizeof(quint64);
+	if (!_webviewStorageIdBots.token.isEmpty()
+		|| !_webviewStorageIdOther.token.isEmpty()) {
+		mapSize += sizeof(quint32)
+			+ Serialize::bytearraySize(_webviewStorageIdBots.token)
+			+ Serialize::bytearraySize(_webviewStorageIdOther.token);
+	}
 
 	EncryptedDescriptor mapData(mapSize);
 	if (!self.isEmpty()) {
@@ -616,6 +633,13 @@ void Account::writeMap() {
 		mapData.stream << quint32(lskSearchSuggestions);
 		mapData.stream << quint64(_searchSuggestionsKey);
 	}
+	if (!_webviewStorageIdBots.token.isEmpty()
+		|| !_webviewStorageIdOther.token.isEmpty()) {
+		mapData.stream << quint32(lskWebviewTokens);
+		mapData.stream
+			<< _webviewStorageIdBots.token
+			<< _webviewStorageIdOther.token;
+	}
 	map.writeEncrypted(mapData, _localKey);
 
 	_mapChanged = false;
@@ -655,11 +679,27 @@ void Account::reset() {
 	_cacheTotalTimeLimit = Database::Settings().totalTimeLimit;
 	_cacheBigFileTotalSizeLimit = Database::Settings().totalSizeLimit;
 	_cacheBigFileTotalTimeLimit = Database::Settings().totalTimeLimit;
+
+	const auto wvbots = _webviewStorageIdBots.path;
+	const auto wvother = _webviewStorageIdOther.path;
+	const auto wvclear = [](Webview::StorageId &storageId) {
+		Webview::ClearStorageDataByToken(
+			base::take(storageId).token.toStdString());
+	};
+	wvclear(_webviewStorageIdBots);
+	wvclear(_webviewStorageIdOther);
+
 	_mapChanged = true;
 	writeMap();
 	writeMtpData();
 
-	crl::async([base = _basePath, temp = _tempPath, names = std::move(names)] {
+	crl::async([
+		base = _basePath,
+		temp = _tempPath,
+		names = std::move(names),
+		wvbots,
+		wvother
+	] {
 		for (const auto &name : names) {
 			if (!name.endsWith(u"map0"_q)
 				&& !name.endsWith(u"map1"_q)
@@ -669,6 +709,12 @@ void Account::reset() {
 			}
 		}
 		QDir(LegacyTempDirectory()).removeRecursively();
+		if (!wvbots.isEmpty()) {
+			QDir(wvbots).removeRecursively();
+		}
+		if (!wvother.isEmpty()) {
+			QDir(wvother).removeRecursively();
+		}
 		QDir(temp).removeRecursively();
 	});
 
@@ -3080,6 +3126,54 @@ bool Account::isBotTrustedOpenWebView(PeerId botId) {
 		&& ((i->second & BotTrustFlag::OpenWebView) != 0);
 }
 
+void Account::enforceModernStorageIdBots() {
+	if (_webviewStorageIdBots.token.isEmpty()) {
+		_webviewStorageIdBots.token = QByteArray::fromStdString(
+			Webview::GenerateStorageToken());
+		writeMapDelayed();
+	}
+}
+
+Webview::StorageId Account::resolveStorageIdBots() {
+	if (!_webviewStorageIdBots) {
+		auto &token = _webviewStorageIdBots.token;
+		const auto legacy = Webview::LegacyStorageIdToken();
+		if (token.isEmpty()) {
+			auto legacyTaken = false;
+			const auto &list = _owner->domain().accounts();
+			for (const auto &[index, account] : list) {
+				if (account.get() != _owner.get()) {
+					const auto &id = account->local()._webviewStorageIdBots;
+					if (id.token == legacy) {
+						legacyTaken = true;
+						break;
+					}
+				}
+			}
+			token = legacyTaken
+				? QByteArray::fromStdString(Webview::GenerateStorageToken())
+				: legacy;
+			writeMapDelayed();
+		}
+		_webviewStorageIdBots.path = (token == legacy)
+			? (BaseGlobalPath() + u"webview"_q)
+			: (_databasePath + u"wvbots"_q);
+	}
+	return _webviewStorageIdBots;
+}
+
+Webview::StorageId Account::resolveStorageIdOther() {
+	if (!_webviewStorageIdOther) {
+		if (_webviewStorageIdOther.token.isEmpty()) {
+			_webviewStorageIdOther.token = QByteArray::fromStdString(
+				Webview::GenerateStorageToken());
+			writeMapDelayed();
+		}
+		_webviewStorageIdOther.path = _databasePath + u"wvother"_q;
+	}
+	return _webviewStorageIdOther;
+}
+
 bool Account::encrypt(
 		const void *src,
 		void *dst,

Telegram/SourceFiles/storage/storage_account.h

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/cache/storage_cache_database.h"
 #include "data/stickers/data_stickers_set.h"
 #include "data/data_drafts.h"
+#include "webview/webview_common.h"
 
 class History;
 
@@ -169,6 +170,10 @@ public:
 	void markBotTrustedOpenWebView(PeerId botId);
 	[[nodiscard]] bool isBotTrustedOpenWebView(PeerId botId);
 
+	void enforceModernStorageIdBots();
+	[[nodiscard]] Webview::StorageId resolveStorageIdBots();
+	[[nodiscard]] Webview::StorageId resolveStorageIdOther();
+
 	[[nodiscard]] bool encrypt(
 		const void *src,
 		void *dst,
@@ -309,6 +314,9 @@ private:
 	bool _recentHashtagsAndBotsWereRead = false;
 	bool _searchSuggestionsRead = false;
 
+	Webview::StorageId _webviewStorageIdBots;
+	Webview::StorageId _webviewStorageIdOther;
+
 	int _oldMapVersion = 0;
 
 	base::Timer _writeMapTimer;

Telegram/SourceFiles/storage/storage_domain.cpp

@@ -268,10 +268,6 @@ void Domain::clearOldVersion() {
 	_oldVersion = 0;
 }
 
-QString Domain::webviewDataPath() const {
-	return BaseGlobalPath() + "webview";
-}
-
 rpl::producer<> Domain::localPasscodeChanged() const {
 	return _passcodeKeyChanged.events();
 }

Telegram/SourceFiles/storage/storage_domain.h

@@ -44,8 +44,6 @@ public:
 	[[nodiscard]] int oldVersion() const;
 	void clearOldVersion();
 
-	[[nodiscard]] QString webviewDataPath() const;
-
 	[[nodiscard]] rpl::producer<> localPasscodeChanged() const;
 	[[nodiscard]] bool hasLocalPasscode() const;
 

Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp

@@ -313,12 +313,12 @@ Panel::Progress::Progress(QWidget *parent, Fn<QRect()> rect)
 }
 
 Panel::Panel(
-	const QString &userDataPath,
+	const Webview::StorageId &storageId,
 	rpl::producer<QString> title,
 	not_null<Delegate*> delegate,
 	MenuButtons menuButtons,
 	bool allowClipboardRead)
-: _userDataPath(userDataPath)
+: _storageId(storageId)
 , _delegate(delegate)
 , _menuButtons(menuButtons)
 , _widget(std::make_unique<SeparatePanel>())
@@ -597,7 +597,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		container,
 		Webview::WindowConfig{
 			.opaqueBg = params.opaqueBg,
-			.userDataPath = _userDataPath,
+			.storageId = _storageId,
 		});
 	const auto raw = &_webview->window;
 
@@ -1339,7 +1339,7 @@ rpl::lifetime &Panel::lifetime() {
 
 std::unique_ptr<Panel> Show(Args &&args) {
 	auto result = std::make_unique<Panel>(
-		args.userDataPath,
+		args.storageId,
 		std::move(args.title),
 		args.delegate,
 		args.menuButtons,

Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h

@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/object_ptr.h"
 #include "base/weak_ptr.h"
 #include "base/flags.h"
+#include "webview/webview_common.h"
 
 class QJsonObject;
 class QJsonValue;
@@ -23,7 +24,6 @@ class SeparatePanel;
 
 namespace Webview {
 struct Available;
-struct ThemeParams;
 } // namespace Webview
 
 namespace Ui::BotWebView {
@@ -72,7 +72,7 @@ public:
 class Panel final : public base::has_weak_ptr {
 public:
 	Panel(
-		const QString &userDataPath,
+		const Webview::StorageId &storageId,
 		rpl::producer<QString> title,
 		not_null<Delegate*> delegate,
 		MenuButtons menuButtons,
@@ -144,7 +144,7 @@ private:
 	[[nodiscard]] QRect progressRect() const;
 	void setupProgressGeometry();
 
-	QString _userDataPath;
+	Webview::StorageId _storageId;
 	const not_null<Delegate*> _delegate;
 	bool _closeNeedConfirmation = false;
 	bool _hasSettingsButton = false;
@@ -172,7 +172,7 @@ private:
 
 struct Args {
 	QString url;
-	QString userDataPath;
+	Webview::StorageId storageId;
 	rpl::producer<QString> title;
 	rpl::producer<QString> bottom;
 	not_null<Delegate*> delegate;

Telegram/SourceFiles/ui/chat/chat.style

@@ -632,7 +632,7 @@ historyPollRadio: Radio(defaultRadio) {
 	diameter: 18px;
 	thickness: 2px;
 	skip: 65px; // * 0.1
-	duration: 120;
+	duration: universalDuration;
 	rippleAreaPadding: 8px;
 }
 historyPollRadioOpacity: 0.7;

Telegram/SourceFiles/ui/controls/send_button.cpp

@@ -40,7 +40,7 @@ void SendButton::setType(Type type) {
 			[=] { update(); },
 			0.,
 			1.,
-			st::historyRecordVoiceDuration);
+			st::universalDuration);
 		setPointerCursor(_type != Type::Slowmode);
 		update();
 	}

Telegram/SourceFiles/window/themes/window_theme.cpp

@@ -35,9 +35,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/style/style_palette_colorizer.h"
 #include "ui/ui_utility.h"
 #include "ui/boxes/confirm_box.h"
-#include "webview/webview_interface.h"
 #include "boxes/background_box.h"
 #include "core/application.h"
+#include "webview/webview_common.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat.h"
 

Telegram/lib_webview

@@ -1 +1 @@
-Subproject commit 7c346c6b042266b5adb116a2114df1d46b37c03f
+Subproject commit 9f9bcaaec922644406faadda4d37014c9dec2dd9