Beta version 2.4.15: Update Dockerfile.

- Improve design of voice chats.
- Fix sending of voice messages as replies.
- Fix 'Open With' menu position in macOS.
- Fix freeze on secondary screen disconnect.

.github/workflows/linux.yml

@@ -72,12 +72,6 @@ jobs:
       - name: Get repository name.
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - name: Yum install.
-        run: |
-          yum -y autoremove git
-          yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
-          yum -y install git
-
       - name: Clone.
         uses: actions/checkout@v2
         with:

.github/workflows/win.yml

@@ -218,7 +218,7 @@ jobs:
           -A Win32 ^
           -D LIBTYPE:STRING=STATIC ^
           -D FORCE_STATIC_VCRT=ON ^
-          -D ALSOFT_BACKEND_WASAPI=OFF
+          -D ALSOFT_BACKEND_DSOUND=OFF
 
           msbuild -m OpenAL.vcxproj /property:Configuration=Debug
 

Telegram/CMakeLists.txt

@@ -33,6 +33,7 @@ include(cmake/td_mtproto.cmake)
 include(cmake/td_lang.cmake)
 include(cmake/td_scheme.cmake)
 include(cmake/td_ui.cmake)
+include(cmake/generate_appdata_changelog.cmake)
 
 set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
 
@@ -1319,6 +1320,7 @@ endif()
 if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
     configure_file("../lib/xdg/telegramdesktop.appdata.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml" @ONLY)
+    generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml")
     install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
     install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png")

Telegram/Resources/langs/lang.strings

@@ -1343,8 +1343,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_broadcast_silent_ph" = "Silent broadcast...";
 "lng_send_anonymous_ph" = "Send anonymously...";
 "lng_record_cancel" = "Release outside this field to cancel";
-"lng_record_lock_cancel" = "Click outside of the circle 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";
 "lng_will_be_notified" = "Members will be notified when you post";
 "lng_wont_be_notified" = "Members will not be notified when you post";
@@ -1819,8 +1819,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_inactive" = "listening";
 "lng_group_call_settings" = "Settings";
 "lng_group_call_unmute" = "Unmute";
+"lng_group_call_unmute_sub" = "or hold spacebar to talk";
 "lng_group_call_you_are_live" = "You are Live";
-"lng_group_call_force_muted" = "You are muted";
+"lng_group_call_force_muted" = "Muted by admin";
+"lng_group_call_force_muted_sub" = "You are in Listen Only mode";
 "lng_group_call_connecting" = "Connecting...";
 "lng_group_call_leave" = "Leave";
 "lng_group_call_leave_title" = "Leave voice chat";
@@ -1829,6 +1831,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_create_sure" = "Do you really want to start a voice chat in this group?";
 "lng_group_call_also_end" = "End voice chat";
 "lng_group_call_settings_title" = "Settings";
+"lng_group_call_invite" = "Invite Member";
+"lng_group_call_invited_status" = "invited";
 "lng_group_call_invite_title" = "Invite members";
 "lng_group_call_invite_button" = "Invite";
 "lng_group_call_new_muted" = "Mute new members";
@@ -1847,8 +1851,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_invite_done_many#one" = "You invited **{count} member** to the voice chat.";
 "lng_group_call_invite_done_many#other" = "You invited **{count} members** to the voice chat.";
 "lng_group_call_no_members" = "click to join";
-"lng_group_call_members#one" = "{count} member";
-"lng_group_call_members#other" = "{count} members";
+"lng_group_call_members#one" = "{count} participant";
+"lng_group_call_members#other" = "{count} participants";
 "lng_group_call_no_anonymous" = "Sorry, anonymous group admins can't join voice chats.";
 "lng_group_call_too_many" = "Sorry, there are too many members in this voice chat. Please try again later.";
 "lng_group_call_context_mute" = "Mute";

Telegram/Resources/qrc/telegram/sounds.qrc

@@ -6,5 +6,8 @@
     <file alias="call_end.mp3">../../sounds/call_end.mp3</file>
     <file alias="call_incoming.mp3">../../sounds/call_incoming.mp3</file>
     <file alias="call_outgoing.mp3">../../sounds/call_outgoing.mp3</file>
+    <file alias="group_call_start.mp3">../../sounds/group_call_start.mp3</file>
+    <file alias="group_call_connect.mp3">../../sounds/group_call_connect.mp3</file>
+    <file alias="group_call_end.mp3">../../sounds/group_call_end.mp3</file>
   </qresource>
 </RCC>

Telegram/Resources/tl/api.tl

@@ -122,12 +122,12 @@ userStatusLastWeek#7bf09fc = UserStatus;
 userStatusLastMonth#77ebc742 = UserStatus;
 
 chatEmpty#9ba2d800 id:int = Chat;
-chat#3bda1bde flags:# creator:flags.0?true kicked:flags.1?true left:flags.2?true deactivated:flags.5?true id:int title:string photo:ChatPhoto participants_count:int date:int version:int migrated_to:flags.6?InputChannel admin_rights:flags.14?ChatAdminRights default_banned_rights:flags.18?ChatBannedRights = Chat;
+chat#3bda1bde flags:# creator:flags.0?true kicked:flags.1?true left:flags.2?true deactivated:flags.5?true call_active:flags.23?true call_not_empty:flags.24?true id:int title:string photo:ChatPhoto participants_count:int date:int version:int migrated_to:flags.6?InputChannel admin_rights:flags.14?ChatAdminRights default_banned_rights:flags.18?ChatBannedRights = Chat;
 chatForbidden#7328bdb id:int title:string = Chat;
 channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true call_active:flags.23?true call_not_empty:flags.24?true id:int access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int version:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int = Chat;
 channelForbidden#289da732 flags:# broadcast:flags.5?true megagroup:flags.8?true id:int access_hash:long title:string until_date:flags.16?int = Chat;
 
-chatFull#1b7c9db3 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int = ChatFull;
+chatFull#dc8c181 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall = ChatFull;
 channelFull#ef3a6acd flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int call:flags.21?InputGroupCall = ChatFull;
 
 chatParticipant#c8d7493e user_id:int inviter_id:int date:int = ChatParticipant;
@@ -365,8 +365,9 @@ updatePeerBlocked#246a4b22 peer_id:Peer blocked:Bool = Update;
 updateChannelUserTyping#ff2abe9f flags:# channel_id:int top_msg_id:flags.0?int user_id:int action:SendMessageAction = Update;
 updatePinnedMessages#ed85eab5 flags:# pinned:flags.0?true peer:Peer messages:Vector<int> pts:int pts_count:int = Update;
 updatePinnedChannelMessages#8588878b flags:# pinned:flags.0?true channel_id:int messages:Vector<int> pts:int pts_count:int = Update;
+updateChat#1330a196 chat_id:int = Update;
 updateGroupCallParticipants#f2ebdb4e call:InputGroupCall participants:Vector<GroupCallParticipant> version:int = Update;
-updateGroupCall#5724806e channel_id:int call:GroupCall = Update;
+updateGroupCall#a45eb99b chat_id:int call:GroupCall = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -547,7 +548,7 @@ inputStickerSetShortName#861cc8a0 short_name:string = InputStickerSet;
 inputStickerSetAnimatedEmoji#28703c8 = InputStickerSet;
 inputStickerSetDice#e67f520e emoticon:string = InputStickerSet;
 
-stickerSet#eeb46f27 flags:# archived:flags.1?true official:flags.2?true masks:flags.3?true animated:flags.5?true installed_date:flags.0?int id:long access_hash:long title:string short_name:string thumb:flags.4?PhotoSize thumb_dc_id:flags.4?int count:int hash:int = StickerSet;
+stickerSet#40e237a8 flags:# archived:flags.1?true official:flags.2?true masks:flags.3?true animated:flags.5?true installed_date:flags.0?int id:long access_hash:long title:string short_name:string thumbs:flags.4?Vector<PhotoSize> thumb_dc_id:flags.4?int count:int hash:int = StickerSet;
 
 messages.stickerSet#b60a24a6 set:StickerSet packs:Vector<StickerPack> documents:Vector<Document> = messages.StickerSet;
 
@@ -1194,7 +1195,7 @@ groupCall#55903081 flags:# join_muted:flags.1?true can_change_join_muted:flags.2
 
 inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
 
-groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
+groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true just_joined:flags.4?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
 
 phone.groupCall#66ab0bfc call:GroupCall participants:Vector<GroupCallParticipant> participants_next_offset:string users:Vector<User> = phone.GroupCall;
 
@@ -1560,7 +1561,7 @@ phone.discardCall#b2cbc1c0 flags:# video:flags.0?true peer:InputPhoneCall durati
 phone.setCallRating#59ead627 flags:# user_initiative:flags.0?true peer:InputPhoneCall rating:int comment:string = Updates;
 phone.saveCallDebug#277add7e peer:InputPhoneCall debug:DataJSON = Bool;
 phone.sendSignalingData#ff7a9383 peer:InputPhoneCall data:bytes = Bool;
-phone.createGroupCall#e428fa02 channel:InputChannel random_id:int = Updates;
+phone.createGroupCall#bd3dabe0 peer:InputPeer random_id:int = Updates;
 phone.joinGroupCall#5f9c8e62 flags:# muted:flags.0?true call:InputGroupCall params:DataJSON = Updates;
 phone.leaveGroupCall#500377f9 call:InputGroupCall source:int = Updates;
 phone.editGroupCallMember#63146ae4 flags:# muted:flags.0?true call:InputGroupCall user_id:InputUser = Updates;

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.4.13.0" />
+    Version="2.4.15.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,13,0
- PRODUCTVERSION 2,4,13,0
+ FILEVERSION 2,4,15,0
+ PRODUCTVERSION 2,4,15,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.4.13.0"
+            VALUE "FileVersion", "2.4.15.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.13.0"
+            VALUE "ProductVersion", "2.4.15.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,13,0
- PRODUCTVERSION 2,4,13,0
+ FILEVERSION 2,4,15,0
+ PRODUCTVERSION 2,4,15,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", "2.4.13.0"
+            VALUE "FileVersion", "2.4.15.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.13.0"
+            VALUE "ProductVersion", "2.4.15.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/api/api_authorizations.cpp

@@ -125,13 +125,20 @@ void Authorizations::requestTerminate(
 		Fn<void(const MTPBool &result)> &&done,
 		Fn<void(const RPCError &error)> &&fail,
 		std::optional<uint64> hash) {
-	auto request = hash
-		? MTPaccount_ResetAuthorization(MTP_long(*hash))
-		: MTPaccount_ResetAuthorization();
-	_api.request(std::move(request))
-	.done(std::move(done))
-	.fail(std::move(fail))
-	.send();
+	const auto send = [&](auto request) {
+		_api.request(
+			std::move(request)
+		).done(
+			std::move(done)
+		).fail(
+			std::move(fail)
+		).send();
+	};
+	if (hash) {
+		send(MTPaccount_ResetAuthorization(MTP_long(*hash)));
+	} else {
+		send(MTPauth_ResetAuthorizations());
+	}
 }
 
 Authorizations::List Authorizations::list() const {

Telegram/SourceFiles/api/api_send_progress.cpp

@@ -19,7 +19,8 @@ namespace Api {
 namespace {
 
 constexpr auto kCancelTypingActionTimeout = crl::time(5000);
-constexpr auto kSetMyActionForMs = 10 * crl::time(1000);
+constexpr auto kSendMySpeakingInterval = 3 * crl::time(1000);
+constexpr auto kSendMyTypingInterval = 5 * crl::time(1000);
 constexpr auto kSendTypingsToOfflineFor = TimeId(30);
 
 } // namespace
@@ -82,12 +83,15 @@ bool SendProgressManager::updated(const Key &key, bool doing) {
 	const auto now = crl::now();
 	const auto i = _updated.find(key);
 	if (doing) {
+		const auto sendEach = (key.type == SendProgressType::Speaking)
+			? kSendMySpeakingInterval
+			: kSendMyTypingInterval;
 		if (i == end(_updated)) {
-			_updated.emplace(key, now + kSetMyActionForMs);
-		} else if (i->second > now + (kSetMyActionForMs / 2)) {
+			_updated.emplace(key, now + 2 * sendEach);
+		} else if (i->second > now + sendEach) {
 			return false;
 		} else {
-			i->second = now + kSetMyActionForMs;
+			i->second = now + 2 * sendEach;
 		}
 	} else {
 		if (i == end(_updated)) {

Telegram/SourceFiles/api/api_updates.cpp

@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_chat_filters.h"
 #include "data/data_cloud_themes.h"
+#include "data/data_group_call.h"
 #include "data/data_drafts.h"
 #include "data/data_histories.h"
 #include "data/data_folder.h"
@@ -232,6 +233,27 @@ Updates::Updates(not_null<Main::Session*> session)
 	)).done([=](const MTPupdates_State &result) {
 		stateDone(result);
 	}).send();
+
+	using namespace rpl::mappers;
+	base::ObservableViewer(
+		api().fullPeerUpdated()
+	) | rpl::filter([](not_null<PeerData*> peer) {
+		return peer->isChat() || peer->isMegagroup();
+	}) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		if (const auto users = _pendingSpeakingCallMembers.take(peer)) {
+			if (const auto call = peer->groupCall()) {
+				for (const auto [userId, when] : *users) {
+					call->applyActiveUpdate(
+						userId,
+						Data::LastSpokeTimes{
+							.anything = when,
+							.voice = when
+						},
+						peer->owner().userLoaded(userId));
+				}
+			}
+		}
+	}, _lifetime);
 }
 
 Main::Session &Updates::session() const {
@@ -890,6 +912,55 @@ bool Updates::isQuitPrevent() {
 	updateOnline();
 	return true;
 }
+void Updates::handleSendActionUpdate(
+		PeerId peerId,
+		MsgId rootId,
+		UserId userId,
+		const MTPSendMessageAction &action) {
+	const auto history = session().data().historyLoaded(peerId);
+	if (!history) {
+		return;
+	}
+	const auto peer = history->peer;
+	const auto user = (userId == session().userId())
+		? session().user().get()
+		: session().data().userLoaded(userId);
+	const auto isSpeakingInCall = (action.type()
+		== mtpc_speakingInGroupCallAction);
+	if (isSpeakingInCall) {
+		const auto call = peer->groupCall();
+		const auto now = crl::now();
+		if (call) {
+			call->applyActiveUpdate(
+				userId,
+				Data::LastSpokeTimes{ .anything = now, .voice = now },
+				user);
+		} else {
+			const auto chat = peer->asChat();
+			const auto channel = peer->asChannel();
+			const auto active = chat
+				? (chat->flags() & MTPDchat::Flag::f_call_active)
+				: (channel->flags() & MTPDchannel::Flag::f_call_active);
+			if (active) {
+				_pendingSpeakingCallMembers.emplace(
+					channel).first->second[userId] = now;
+				session().api().requestFullPeer(channel);
+			}
+		}
+	}
+	if (!user || user->isSelf()) {
+		return;
+	}
+	const auto when = requestingDifference()
+		? 0
+		: base::unixtime::now();
+	session().data().registerSendAction(
+		history,
+		rootId,
+		user,
+		action,
+		when);
+}
 
 void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 	switch (updates.type()) {
@@ -1580,57 +1651,29 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 
 	case mtpc_updateUserTyping: {
 		auto &d = update.c_updateUserTyping();
-		const auto userId = peerFromUser(d.vuser_id());
-		const auto history = session().data().historyLoaded(userId);
-		const auto user = session().data().userLoaded(d.vuser_id().v);
-		if (history && user) {
-			const auto when = requestingDifference() ? 0 : base::unixtime::now();
-			session().data().registerSendAction(
-				history,
-				MsgId(),
-				user,
-				d.vaction(),
-				when);
-		}
+		handleSendActionUpdate(
+			peerFromUser(d.vuser_id()),
+			0,
+			d.vuser_id().v,
+			d.vaction());
 	} break;
 
 	case mtpc_updateChatUserTyping: {
 		auto &d = update.c_updateChatUserTyping();
-		const auto history = session().data().historyLoaded(
-			peerFromChat(d.vchat_id()));
-		const auto user = (d.vuser_id().v == session().userId())
-			? nullptr
-			: session().data().userLoaded(d.vuser_id().v);
-		if (history && user) {
-			const auto when = requestingDifference() ? 0 : base::unixtime::now();
-			session().data().registerSendAction(
-				history,
-				MsgId(),
-				user,
-				d.vaction(),
-				when);
-		}
+		handleSendActionUpdate(
+			peerFromChat(d.vchat_id()),
+			0,
+			d.vuser_id().v,
+			d.vaction());
 	} break;
 
 	case mtpc_updateChannelUserTyping: {
 		const auto &d = update.c_updateChannelUserTyping();
-		const auto history = session().data().historyLoaded(
-			peerFromChannel(d.vchannel_id()));
-		const auto user = (d.vuser_id().v == session().userId())
-			? nullptr
-			: session().data().userLoaded(d.vuser_id().v);
-		if (history && user) {
-			const auto when = requestingDifference()
-				? 0
-				: base::unixtime::now();
-			const auto rootId = d.vtop_msg_id().value_or_empty();
-			session().data().registerSendAction(
-				history,
-				rootId,
-				user,
-				d.vaction(),
-				when);
-		}
+		handleSendActionUpdate(
+			peerFromChannel(d.vchannel_id()),
+			d.vtop_msg_id().value_or_empty(),
+			d.vuser_id().v,
+			d.vaction());
 	} break;
 
 	case mtpc_updateChatParticipants: {
@@ -1799,15 +1842,6 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updatePhoneCallSignalingData:
 	case mtpc_updateGroupCallParticipants:
 	case mtpc_updateGroupCall: {
-		if (update.type() == mtpc_updateGroupCall) {
-			const auto &data = update.c_updateGroupCall();
-			if (data.vcall().type() == mtpc_groupCallDiscarded) {
-				const auto &call = data.vcall().c_groupCallDiscarded();
-				session().data().groupCallDiscarded(
-					call.vid().v,
-					call.vduration().v);
-			}
-		}
 		Core::App().calls().handleUpdate(&session(), update);
 	} break;
 

Telegram/SourceFiles/api/api_updates.h

@@ -122,6 +122,12 @@ private:
 		base::flat_map<not_null<ChannelData*>, crl::time> &whenMap,
 		crl::time &curTime);
 
+	void handleSendActionUpdate(
+		PeerId peerId,
+		MsgId rootId,
+		UserId userId,
+		const MTPSendMessageAction &action);
+
 	const not_null<Main::Session*> _session;
 
 	int32 _updatesDate = 0;
@@ -160,6 +166,9 @@ private:
 	bool _handlingChannelDifference = false;
 
 	base::flat_map<int, ActiveChatTracker> _activeChats;
+	base::flat_map<
+		not_null<PeerData*>,
+		base::flat_map<UserId, crl::time>> _pendingSpeakingCallMembers;
 
 	mtpRequestId _onlineRequest = 0;
 	base::Timer _idleFinishTimer;

Telegram/SourceFiles/apiwrap.cpp

@@ -3412,7 +3412,7 @@ void ApiWrap::jumpToHistoryDate(not_null<PeerData*> peer, const QDate &date) {
 //	requestMessageAfterDate(feed, date, [=](Data::MessagePosition result) {
 //		Ui::hideLayer();
 //		App::wnd()->sessionController()->showSection(
-//			HistoryFeed::Memento(feed, result));
+//			std::make_shared<HistoryFeed::Memento>(feed, result));
 //	});
 //}
 

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -80,7 +80,7 @@ auto ListFromMimeData(not_null<const QMimeData*> data) {
 	if (result.error == Error::None) {
 		return result;
 	} else if (data->hasImage()) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}

Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp

@@ -1369,9 +1369,12 @@ bool ParticipantsBoxController::feedMegagroupLastParticipants() {
 		return false;
 	}
 
+	auto added = false;
 	_additional.fillFromPeer();
 	for (const auto user : info->lastParticipants) {
-		appendRow(user);
+		if (appendRow(user)) {
+			added = true;
+		}
 
 		//
 		// Don't count lastParticipants in _offset, because we don't know
@@ -1383,7 +1386,7 @@ bool ParticipantsBoxController::feedMegagroupLastParticipants() {
 	if (_onlineSorter) {
 		_onlineSorter->sort();
 	}
-	return true;
+	return added;
 }
 
 void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {

Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp

@@ -1000,13 +1000,15 @@ void Controller::fillManageSection() {
 			st::infoIconBlacklist);
 	}
 	if (hasRecentActions) {
+		auto callback = [=] {
+			_navigation->showSection(
+				std::make_shared<AdminLog::SectionMemento>(channel));
+		};
 		AddButtonWithCount(
 			_controls.buttonsLayout,
 			tr::lng_manage_peer_recent_actions(),
 			rpl::single(QString()), //Empty count.
-			[=] {
-				_navigation->showSection(AdminLog::SectionMemento(channel));
-			},
+			std::move(callback),
 			st::infoIconRecentActions);
 	}
 

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -767,7 +767,7 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 		if (result.error == Ui::PreparedList::Error::None) {
 			return result;
 		} else if (data->hasImage()) {
-			auto image = Platform::GetClipboardImage();
+			auto image = Platform::GetImageFromClipboard();
 			if (image.isNull()) {
 				image = qvariant_cast<QImage>(data->imageData());
 			}

Telegram/SourceFiles/boxes/sessions_box.cpp

@@ -292,7 +292,7 @@ void SessionsContent::terminateAll() {
 	auto callback = [=] {
 		const auto reset = crl::guard(weak, [=] {
 			_authorizations->cancelCurrentRequest();
-			shortPollSessions();
+			_authorizations->reload();
 		});
 		_authorizations->requestTerminate(
 			[=](const MTPBool &result) { reset(); },

Telegram/SourceFiles/boxes/sticker_set_box.cpp

@@ -334,14 +334,20 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 			_setHash = set.vhash().v;
 			_setFlags = set.vflags().v;
 			_setInstallDate = set.vinstalled_date().value_or(0);
-			if (const auto thumb = set.vthumb()) {
-				_setThumbnail = Images::FromPhotoSize(
-					&_controller->session(),
-					set,
-					*thumb);
-			} else {
-				_setThumbnail = ImageWithLocation();
-			}
+			_setThumbnail = [&] {
+				if (const auto thumbs = set.vthumbs()) {
+					for (const auto &thumb : thumbs->v) {
+						const auto result = Images::FromPhotoSize(
+							&_controller->session(),
+							set,
+							thumb);
+						if (result.location.valid()) {
+							return result;
+						}
+					}
+				}
+				return ImageWithLocation();
+			}();
 			const auto &sets = _controller->session().data().stickers().sets();
 			const auto it = sets.find(_setId);
 			if (it != sets.cend()) {

Telegram/SourceFiles/calls/calls.style

@@ -465,8 +465,8 @@ groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
 	}
 	height: 52px;
 	photoPosition: point(12px, 6px);
-	namePosition: point(68px, 7px);
-	statusPosition: point(68px, 26px);
+	namePosition: point(63px, 7px);
+	statusPosition: point(63px, 26px);
 	photoSize: 40px;
 	nameFg: groupCallMembersFg;
 	nameFgChecked: groupCallMembersFg;
@@ -512,26 +512,36 @@ groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
 	}
 }
 
-groupCallMembersHeader: 47px;
+groupCallMembersTop: 62px;
+groupCallTitleTop: 14px;
+groupCallSubtitleTop: 33px;
+
 groupCallMembersMargin: margins(16px, 16px, 16px, 28px);
-groupCallAddMember: IconButton(defaultIconButton) {
-	width: 36px;
-	height: 36px;
-	iconPosition: point(3px, 5px);
-	icon: icon {{ "info_add_member", groupCallMemberInactiveIcon }};
-	iconOver: icon {{ "info_add_member", groupCallMemberInactiveIcon }};
-	rippleAreaPosition: point(0px, 0px);
-	rippleAreaSize: 36px;
+groupCallAddMember: SettingsButton(defaultSettingsButton) {
+	textFg: groupCallMemberNotJoinedStatus;
+	textFgOver: groupCallMemberNotJoinedStatus;
+	textBg: groupCallMembersBg;
+	textBgOver: groupCallMembersBgOver;
+
+	font: semiboldFont;
+
+	height: 22px;
+	padding: margins(63px, 17px, 22px, 11px);
+
 	ripple: groupCallRipple;
 }
-groupCallHeaderPosition: point(16px, 16px);
-groupCallHeaderLabel: FlatLabel(defaultFlatLabel) {
+groupCallAddMemberIcon: icon {{ "info_add_member", groupCallMemberInactiveIcon, point(0px, 3px) }};
+groupCallAddMemberIconLeft: 16px;
+groupCallSubtitleLabel: FlatLabel(defaultFlatLabel) {
 	maxHeight: 18px;
+	textFg: groupCallMemberNotJoinedStatus;
+}
+groupCallTitleLabel: FlatLabel(groupCallSubtitleLabel) {
 	textFg: groupCallMembersFg;
 	style: TextStyle(defaultTextStyle) {
-		font: semiboldFont;
-		linkFont: semiboldFont;
-		linkFontOver: semiboldFont;
+		font: font(semibold 14px);
+		linkFont: font(semibold 14px);
+		linkFontOver: font(semibold 14px);
 	}
 }
 groupCallAddButtonPosition: point(10px, 7px);
@@ -562,6 +572,8 @@ groupCallMemberColoredCrossLine: CrossLineAnimation(groupCallMemberInactiveCross
 	fg: groupCallMemberMutedIcon;
 	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
 }
+groupCallMemberInvited: icon {{ "calls/group_calls_invited", groupCallMemberInactiveIcon }};
+groupCallMemberInvitedPosition: point(2px, 12px);
 
 groupCallSettings: CallButton(callMicrophoneMute) {
 	button: IconButton(callButton) {
@@ -584,8 +596,8 @@ groupCallHangup: CallButton(callHangup) {
 	label: callButtonLabel;
 }
 groupCallButtonSkip: 43px;
-groupCallButtonBottomSkip: 134px;
-groupCallMuteBottomSkip: 149px;
+groupCallButtonBottomSkip: 145px;
+groupCallMuteBottomSkip: 160px;
 
 groupCallTopBarUserpicSize: 28px;
 groupCallTopBarUserpicShift: 8px;
@@ -722,8 +734,8 @@ groupCallTitleCloseIconOver: icon {
 };
 groupCallTitle: WindowTitle(defaultWindowTitle) {
 	height: 0px;
-	bg: groupCallBg;
-	bgActive: groupCallBg;
+	bg: transparent;
+	bgActive: transparent;
 	fg: transparent;
 	fgActive: transparent;
 	minimize: IconButton(groupCallTitleButton) {
@@ -750,16 +762,11 @@ groupCallTitle: WindowTitle(defaultWindowTitle) {
 	closeIconActiveOver: groupCallTitleCloseIconOver;
 }
 
-groupCallMajorBlobMinRadius: 2px;
-groupCallMajorBlobMaxRadius: 2px;
+groupCallMajorBlobIdleRadius: 2px;
+groupCallMajorBlobMaxRadius: 4px;
 
-groupCallMinorBlobMinRadius: 3px;
-groupCallMinorBlobMaxRadius: 9px;
-
-groupCallMajorBlobTopOffset: 0px;
-groupCallMinorBlobTopOffset: 6px;
-
-groupCallBlobWidthAdditional: 40px;
+groupCallMinorBlobIdleRadius: 3px;
+groupCallMinorBlobMaxRadius: 12px;
 
 callTopBarMuteCrossLine: CrossLineAnimation {
 	fg: callBarFg;

Telegram/SourceFiles/calls/calls_call.cpp

@@ -951,20 +951,20 @@ void Call::setState(State state) {
 			_startTime = crl::now();
 			break;
 		case State::ExchangingKeys:
-			_delegate->playSound(Delegate::Sound::Connecting);
+			_delegate->callPlaySound(Delegate::CallSound::Connecting);
 			break;
 		case State::Ended:
-			_delegate->playSound(Delegate::Sound::Ended);
+			_delegate->callPlaySound(Delegate::CallSound::Ended);
 			[[fallthrough]];
 		case State::EndedByOtherDevice:
 			_delegate->callFinished(this);
 			break;
 		case State::Failed:
-			_delegate->playSound(Delegate::Sound::Ended);
+			_delegate->callPlaySound(Delegate::CallSound::Ended);
 			_delegate->callFailed(this);
 			break;
 		case State::Busy:
-			_delegate->playSound(Delegate::Sound::Busy);
+			_delegate->callPlaySound(Delegate::CallSound::Busy);
 			break;
 		}
 	}

Telegram/SourceFiles/calls/calls_call.h

@@ -62,15 +62,16 @@ public:
 		virtual void callFailed(not_null<Call*> call) = 0;
 		virtual void callRedial(not_null<Call*> call) = 0;
 
-		enum class Sound {
+		enum class CallSound {
 			Connecting,
 			Busy,
 			Ended,
 		};
-		virtual void playSound(Sound sound) = 0;
+		virtual void callPlaySound(CallSound sound) = 0;
 		virtual void callRequestPermissionsOrFail(
 			Fn<void()> onSuccess,
 			bool video) = 0;
+
 		virtual auto getVideoCapture()
 			-> std::shared_ptr<tgcalls::VideoCaptureInterface> = 0;
 

Telegram/SourceFiles/calls/calls_group_call.cpp

@@ -12,17 +12,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 #include "lang/lang_hardcoded.h"
-#include "boxes/confirm_box.h"
+#include "boxes/peers/edit_participants_box.h" // SubscribeToMigration.
 #include "ui/toasts/common_toasts.h"
 #include "base/unixtime.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_changes.h"
 #include "data/data_user.h"
+#include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 #include "data/data_session.h"
 #include "base/global_shortcuts.h"
+#include "webrtc/webrtc_media_devices.h"
 
 #include <tgcalls/group/GroupInstanceImpl.h>
 
@@ -41,20 +43,31 @@ constexpr auto kMaxInvitePerSlice = 10;
 constexpr auto kCheckLastSpokeInterval = crl::time(1000);
 constexpr auto kCheckJoinedTimeout = 4 * crl::time(1000);
 constexpr auto kUpdateSendActionEach = crl::time(500);
+constexpr auto kPlayConnectingEach = crl::time(1056) + 2 * crl::time(1000);
+
+[[nodiscard]] std::unique_ptr<Webrtc::MediaDevices> CreateMediaDevices() {
+	const auto &settings = Core::App().settings();
+	return Webrtc::CreateMediaDevices(
+		settings.callInputDeviceId(),
+		settings.callOutputDeviceId(),
+		settings.callVideoInputDeviceId());
+}
 
 } // namespace
 
 GroupCall::GroupCall(
 	not_null<Delegate*> delegate,
-	not_null<ChannelData*> channel,
+	not_null<PeerData*> peer,
 	const MTPInputGroupCall &inputCall)
 : _delegate(delegate)
-, _channel(channel)
-, _history(channel->owner().history(channel))
-, _api(&_channel->session().mtp())
+, _peer(peer)
+, _history(peer->owner().history(peer))
+, _api(&peer->session().mtp())
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
 , _checkJoinedTimer([=] { checkJoined(); })
-, _pushToTalkCancelTimer([=] { pushToTalkCancel(); }) {
+, _pushToTalkCancelTimer([=] { pushToTalkCancel(); })
+, _connectingSoundTimer([=] { playConnectingSoundOnce(); })
+, _mediaDevices(CreateMediaDevices()) {
 	_muted.value(
 	) | rpl::combine_previous(
 	) | rpl::start_with_next([=](MuteState previous, MuteState state) {
@@ -70,8 +83,8 @@ GroupCall::GroupCall(
 
 	const auto id = inputCall.c_inputGroupCall().vid().v;
 	if (id) {
-		if (const auto call = _channel->call(); call && call->id() == id) {
-			if (!_channel->canManageCall() && call->joinMuted()) {
+		if (const auto call = _peer->groupCall(); call && call->id() == id) {
+			if (!_peer->canManageGroupCall() && call->joinMuted()) {
 				_muted = MuteState::ForceMuted;
 			}
 		}
@@ -80,6 +93,22 @@ GroupCall::GroupCall(
 	} else {
 		start();
 	}
+
+	_mediaDevices->audioInputId(
+	) | rpl::start_with_next([=](QString id) {
+		_audioInputId = id;
+		if (_instance) {
+			_instance->setAudioInputDevice(id.toStdString());
+		}
+	}, _lifetime);
+
+	_mediaDevices->audioOutputId(
+	) | rpl::start_with_next([=](QString id) {
+		_audioOutputId = id;
+		if (_instance) {
+			_instance->setAudioOutputDevice(id.toStdString());
+		}
+	}, _lifetime);
 }
 
 GroupCall::~GroupCall() {
@@ -108,9 +137,22 @@ void GroupCall::setState(State state) {
 	}
 	_state = state;
 
-	if (_state.current() == State::Joined && !_pushToTalkStarted) {
-		_pushToTalkStarted = true;
-		applyGlobalShortcutChanges();
+	if (state == State::Joined) {
+		stopConnectingSound();
+		if (!_hadJoinedState) {
+			_hadJoinedState = true;
+			applyGlobalShortcutChanges();
+			_delegate->groupCallPlaySound(Delegate::GroupCallSound::Started);
+		}
+		if (const auto call = _peer->groupCall(); call && call->id() == _id) {
+			call->setInCall();
+		}
+	} else if (state == State::Connecting || state == State::Joining) {
+		if (_hadJoinedState) {
+			playConnectingSound();
+		}
+	} else {
+		stopConnectingSound();
 	}
 
 	if (false
@@ -121,6 +163,10 @@ void GroupCall::setState(State state) {
 		destroyController();
 	}
 	switch (state) {
+	case State::HangingUp:
+	case State::FailedHangingUp:
+		_delegate->groupCallPlaySound(Delegate::GroupCallSound::Ended);
+		break;
 	case State::Ended:
 		_delegate->groupCallFinished(this);
 		break;
@@ -135,13 +181,29 @@ void GroupCall::setState(State state) {
 	}
 }
 
+void GroupCall::playConnectingSound() {
+	if (_connectingSoundTimer.isActive()) {
+		return;
+	}
+	playConnectingSoundOnce();
+	_connectingSoundTimer.callEach(kPlayConnectingEach);
+}
+
+void GroupCall::stopConnectingSound() {
+	_connectingSoundTimer.cancel();
+}
+
+void GroupCall::playConnectingSoundOnce() {
+	_delegate->groupCallPlaySound(Delegate::GroupCallSound::Connecting);
+}
+
 void GroupCall::start() {
 	_createRequestId = _api.request(MTPphone_CreateGroupCall(
-		_channel->inputChannel,
+		_peer->input,
 		MTP_int(rand_value<int32>())
 	)).done([=](const MTPUpdates &result) {
 		_acceptFields = true;
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 		_acceptFields = false;
 	}).fail([=](const RPCError &error) {
 		LOG(("Call Error: Could not create, error: %1"
@@ -157,7 +219,13 @@ void GroupCall::start() {
 
 void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	setState(State::Joining);
-	_channel->setCall(inputCall);
+	if (const auto chat = _peer->asChat()) {
+		chat->setGroupCall(inputCall);
+	} else if (const auto group = _peer->asMegagroup()) {
+		group->setGroupCall(inputCall);
+	} else {
+		Unexpected("Peer type in GroupCall::join.");
+	}
 
 	inputCall.match([&](const MTPDinputGroupCall &data) {
 		_id = data.vid().v;
@@ -166,7 +234,7 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	});
 
 	using Update = Data::GroupCall::ParticipantUpdate;
-	_channel->call()->participantUpdated(
+	_peer->groupCall()->participantUpdated(
 	) | rpl::filter([=](const Update &update) {
 		return (_instance != nullptr) && !update.now;
 	}) | rpl::start_with_next([=](const Update &update) {
@@ -174,6 +242,10 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 
 		_instance->removeSsrcs({ update.was->ssrc });
 	}, _lifetime);
+
+	SubscribeToMigration(_peer, _lifetime, [=](not_null<ChannelData*> group) {
+		_peer = group;
+	});
 }
 
 void GroupCall::rejoin() {
@@ -229,7 +301,7 @@ void GroupCall::rejoin() {
 					: State::Connecting);
 				applySelfInCallLocally();
 				maybeSendMutedUpdate(wasMuteState);
-				_channel->session().api().applyUpdates(updates);
+				_peer->session().api().applyUpdates(updates);
 			}).fail([=](const RPCError &error) {
 				const auto type = error.type();
 				LOG(("Call Error: Could not join, error: %1").arg(type));
@@ -255,13 +327,13 @@ void GroupCall::rejoin() {
 }
 
 void GroupCall::applySelfInCallLocally() {
-	const auto call = _channel->call();
+	const auto call = _peer->groupCall();
 	if (!call || call->id() != _id) {
 		return;
 	}
 	using Flag = MTPDgroupCallParticipant::Flag;
 	const auto &participants = call->participants();
-	const auto self = _channel->session().user();
+	const auto self = _peer->session().user();
 	const auto i = ranges::find(
 		participants,
 		self,
@@ -307,7 +379,7 @@ void GroupCall::discard() {
 		// Here 'this' could be destroyed by updates, so we set Ended after
 		// updates being handled, but in a guarded way.
 		crl::on_main(this, [=] { hangup(); });
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		hangup();
 	}).send();
@@ -338,7 +410,7 @@ void GroupCall::finish(FinishType type) {
 
 	// We want to leave request still being sent and processed even if
 	// the call is already destroyed.
-	const auto session = &_channel->session();
+	const auto session = &_peer->session();
 	const auto weak = base::make_weak(this);
 	session->api().request(MTPphone_LeaveGroupCall(
 		inputCall(),
@@ -453,7 +525,7 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 		return;
 	}
 
-	const auto self = _channel->session().userId();
+	const auto self = _peer->session().userId();
 	for (const auto &participant : data.vparticipants().v) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
 			if (data.vuser_id().v != self) {
@@ -482,31 +554,33 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 }
 
 void GroupCall::createAndStartController() {
-	using AudioLevels = std::vector<std::pair<uint32_t, float>>;
-
 	const auto &settings = Core::App().settings();
 
 	const auto weak = base::make_weak(this);
-	const auto myLevel = std::make_shared<float>();
+	const auto myLevel = std::make_shared<tgcalls::GroupLevelValue>();
 	tgcalls::GroupInstanceDescriptor descriptor = {
 		.config = tgcalls::GroupConfig{
 		},
 		.networkStateUpdated = [=](bool connected) {
 			crl::on_main(weak, [=] { setInstanceConnected(connected); });
 		},
-		.audioLevelsUpdated = [=](const AudioLevels &data) {
-			if (!data.empty()) {
-				crl::on_main(weak, [=] { audioLevelsUpdated(data); });
+		.audioLevelsUpdated = [=](const tgcalls::GroupLevelsUpdate &data) {
+			const auto &updates = data.updates;
+			if (updates.empty()) {
+				return;
+			} else if (updates.size() == 1 && !updates.front().ssrc) {
+				const auto &value = updates.front().value;
+				// Don't send many 0 while we're muted.
+				if (myLevel->level == value.level
+					&& myLevel->voice == value.voice) {
+					return;
+				}
+				*myLevel = updates.front().value;
 			}
+			crl::on_main(weak, [=] { audioLevelsUpdated(data); });
 		},
-		.myAudioLevelUpdated = [=](float level) {
-			if (*myLevel != level) { // Don't send many 0 while we're muted.
-				*myLevel = level;
-				crl::on_main(weak, [=] { myLevelUpdated(level); });
-			}
-		},
-		.initialInputDeviceId = settings.callInputDeviceId().toStdString(),
-		.initialOutputDeviceId = settings.callOutputDeviceId().toStdString(),
+		.initialInputDeviceId = _audioInputId.toStdString(),
+		.initialOutputDeviceId = _audioOutputId.toStdString(),
 	};
 	if (Logs::DebugEnabled()) {
 		auto callLogFolder = cWorkingDir() + qsl("DebugLogs");
@@ -526,6 +600,7 @@ void GroupCall::createAndStartController() {
 	LOG(("Call Info: Creating group instance"));
 	_instance = std::make_unique<tgcalls::GroupInstanceImpl>(
 		std::move(descriptor));
+
 	updateInstanceMuteState();
 
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
@@ -539,28 +614,32 @@ void GroupCall::updateInstanceMuteState() {
 		&& state != MuteState::PushToTalk);
 }
 
-void GroupCall::handleLevelsUpdated(
-		gsl::span<const std::pair<std::uint32_t, float>> data) {
-	Expects(!data.empty());
+void GroupCall::audioLevelsUpdated(const tgcalls::GroupLevelsUpdate &data) {
+	Expects(!data.updates.empty());
 
 	auto check = false;
 	auto checkNow = false;
 	const auto now = crl::now();
-	for (const auto &[ssrc, level] : data) {
+	for (const auto &[ssrcOrZero, value] : data.updates) {
+		const auto ssrc = ssrcOrZero ? ssrcOrZero : _mySsrc;
+		const auto level = value.level;
+		const auto voice = value.voice;
 		const auto self = (ssrc == _mySsrc);
 		_levelUpdates.fire(LevelUpdate{
 			.ssrc = ssrc,
 			.value = level,
+			.voice = voice,
 			.self = self
 		});
 		if (level <= kSpeakLevelThreshold) {
 			continue;
 		}
 		if (self
+			&& voice
 			&& (!_lastSendProgressUpdate
 				|| _lastSendProgressUpdate + kUpdateSendActionEach < now)) {
 			_lastSendProgressUpdate = now;
-			_channel->session().sendProgressManager().update(
+			_peer->session().sendProgressManager().update(
 				_history,
 				Api::SendProgressType::Speaking);
 		}
@@ -568,13 +647,21 @@ void GroupCall::handleLevelsUpdated(
 		check = true;
 		const auto i = _lastSpoke.find(ssrc);
 		if (i == _lastSpoke.end()) {
-			_lastSpoke.emplace(ssrc, now);
+			_lastSpoke.emplace(ssrc, Data::LastSpokeTimes{
+				.anything = now,
+				.voice = voice ? now : 0,
+			});
 			checkNow = true;
 		} else {
-			if (i->second + kCheckLastSpokeInterval / 3 <= now) {
+			if ((i->second.anything + kCheckLastSpokeInterval / 3 <= now)
+				|| (voice
+					&& i->second.voice + kCheckLastSpokeInterval / 3 <= now)) {
 				checkNow = true;
 			}
-			i->second = now;
+			i->second.anything = now;
+			if (voice) {
+				i->second.voice = now;
+			}
 		}
 	}
 	if (checkNow) {
@@ -584,18 +671,8 @@ void GroupCall::handleLevelsUpdated(
 	}
 }
 
-void GroupCall::myLevelUpdated(float level) {
-	const auto pair = std::pair<std::uint32_t, float>{ _mySsrc, level };
-	handleLevelsUpdated({ &pair, &pair + 1 });
-}
-
-void GroupCall::audioLevelsUpdated(
-		const std::vector<std::pair<std::uint32_t, float>> &data) {
-	handleLevelsUpdated(gsl::make_span(data));
-}
-
 void GroupCall::checkLastSpoke() {
-	const auto real = _channel->call();
+	const auto real = _peer->groupCall();
 	if (!real || real->id() != _id) {
 		return;
 	}
@@ -605,7 +682,7 @@ void GroupCall::checkLastSpoke() {
 	auto list = base::take(_lastSpoke);
 	for (auto i = list.begin(); i != list.end();) {
 		const auto [ssrc, when] = *i;
-		if (when + kCheckLastSpokeInterval >= now) {
+		if (when.anything + kCheckLastSpokeInterval >= now) {
 			hasRecent = true;
 			++i;
 		} else {
@@ -678,7 +755,7 @@ void GroupCall::sendMutedUpdate() {
 		MTP_inputUserSelf()
 	)).done([=](const MTPUpdates &result) {
 		_updateMuteRequestId = 0;
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		_updateMuteRequestId = 0;
 		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
@@ -689,14 +766,20 @@ void GroupCall::sendMutedUpdate() {
 	}).send();
 }
 
+rpl::producer<bool> GroupCall::connectingValue() const {
+	using namespace rpl::mappers;
+	return _state.value() | rpl::map(
+		_1 == State::Creating
+		|| _1 == State::Joining
+		|| _1 == State::Connecting
+	) | rpl::distinct_until_changed();
+}
+
 void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
-	if (_instance) {
-		const auto id = deviceId.toStdString();
-		if (input) {
-			_instance->setAudioInputDevice(id);
-		} else {
-			_instance->setAudioOutputDevice(id);
-		}
+	if (input) {
+		_mediaDevices->switchToAudioInput(deviceId);
+	} else {
+		_mediaDevices->switchToAudioOutput(deviceId);
 	}
 }
 
@@ -711,7 +794,7 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 		inputCall(),
 		user->inputUser
 	)).done([=](const MTPUpdates &result) {
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
 			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
@@ -723,11 +806,11 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 
 std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 		const std::vector<not_null<UserData*>> &users) {
-	const auto real = _channel->call();
+	const auto real = _peer->groupCall();
 	if (!real || real->id() != _id) {
 		return 0;
 	}
-	const auto owner = &_channel->owner();
+	const auto owner = &_peer->owner();
 	const auto &invited = owner->invitedToCallUsers(_id);
 	const auto &participants = real->participants();
 	auto &&toInvite = users | ranges::view::filter([&](
@@ -748,7 +831,7 @@ std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 			inputCall(),
 			MTP_vector<MTPInputUser>(slice)
 		)).done([=](const MTPUpdates &result) {
-			_channel->session().api().applyUpdates(result);
+			_peer->session().api().applyUpdates(result);
 		}).send();
 		slice.clear();
 	};
@@ -756,7 +839,7 @@ std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 		if (!count && slice.empty()) {
 			result = user;
 		}
-		owner->registerInvitedToCallUser(_id, _channel, user);
+		owner->registerInvitedToCallUser(_id, _peer, user);
 		slice.push_back(user->inputUser);
 		if (slice.size() == kMaxInvitePerSlice) {
 			sendSlice();
@@ -808,21 +891,26 @@ void GroupCall::applyGlobalShortcutChanges() {
 	}
 	_pushToTalk = shortcut;
 	_shortcutManager->startWatching(_pushToTalk, [=](bool pressed) {
-		const auto delay = Core::App().settings().groupCallPushToTalkDelay();
-		if (muted() == MuteState::ForceMuted
-			|| muted() == MuteState::Active) {
-			return;
-		} else if (pressed) {
-			_pushToTalkCancelTimer.cancel();
-			setMuted(MuteState::PushToTalk);
-		} else if (delay) {
-			_pushToTalkCancelTimer.callOnce(delay);
-		} else {
-			pushToTalkCancel();
-		}
+		pushToTalk(
+			pressed,
+			Core::App().settings().groupCallPushToTalkDelay());
 	});
 }
 
+void GroupCall::pushToTalk(bool pressed, crl::time delay) {
+	if (muted() == MuteState::ForceMuted
+		|| muted() == MuteState::Active) {
+		return;
+	} else if (pressed) {
+		_pushToTalkCancelTimer.cancel();
+		setMuted(MuteState::PushToTalk);
+	} else if (delay) {
+		_pushToTalkCancelTimer.callOnce(delay);
+	} else {
+		pushToTalkCancel();
+	}
+}
+
 void GroupCall::pushToTalkCancel() {
 	_pushToTalkCancelTimer.cancel();
 	if (muted() == MuteState::PushToTalk) {
@@ -864,7 +952,7 @@ void GroupCall::handleControllerError(const QString &error) {
 		//		"{user}",
 		//		_user->name)));
 	} else if (error == u"ERROR_AUDIO_IO"_q) {
-		Ui::show(Box<InformBox>(tr::lng_call_error_audio_io(tr::now)));
+		//Ui::show(Box<InformBox>(tr::lng_call_error_audio_io(tr::now)));
 	}
 	//finish(FinishType::Failed);
 }

Telegram/SourceFiles/calls/calls_group_call.h

@@ -17,6 +17,7 @@ class History;
 
 namespace tgcalls {
 class GroupInstanceImpl;
+struct GroupLevelsUpdate;
 } // namespace tgcalls
 
 namespace base {
@@ -24,6 +25,14 @@ class GlobalShortcutManager;
 class GlobalShortcutValue;
 } // namespace base
 
+namespace Webrtc {
+class MediaDevices;
+} // namespace Webrtc
+
+namespace Data {
+struct LastSpokeTimes;
+} // namespace Data
+
 namespace Calls {
 
 enum class MuteState {
@@ -42,6 +51,7 @@ enum class MuteState {
 struct LevelUpdate {
 	uint32 ssrc = 0;
 	float value = 0.;
+	bool voice = false;
 	bool self = false;
 };
 
@@ -55,21 +65,28 @@ public:
 		virtual void groupCallFailed(not_null<GroupCall*> call) = 0;
 		virtual void groupCallRequestPermissionsOrFail(
 			Fn<void()> onSuccess) = 0;
+
+		enum class GroupCallSound {
+			Started,
+			Connecting,
+			Ended,
+		};
+		virtual void groupCallPlaySound(GroupCallSound sound) = 0;
 	};
 
 	using GlobalShortcutManager = base::GlobalShortcutManager;
 
 	GroupCall(
 		not_null<Delegate*> delegate,
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		const MTPInputGroupCall &inputCall);
 	~GroupCall();
 
 	[[nodiscard]] uint64 id() const {
 		return _id;
 	}
-	[[nodiscard]] not_null<ChannelData*> channel() const {
-		return _channel;
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
 	}
 
 	void start();
@@ -103,6 +120,7 @@ public:
 	[[nodiscard]] rpl::producer<State> stateValue() const {
 		return _state.value();
 	}
+	[[nodiscard]] rpl::producer<bool> connectingValue() const;
 
 	[[nodiscard]] rpl::producer<LevelUpdate> levelUpdates() const {
 		return _levelUpdates.events();
@@ -120,6 +138,8 @@ public:
 	std::shared_ptr<GlobalShortcutManager> ensureGlobalShortcutManager();
 	void applyGlobalShortcutChanges();
 
+	void pushToTalk(bool pressed, crl::time delay);
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -146,11 +166,7 @@ private:
 	void applySelfInCallLocally();
 	void rejoin();
 
-	void myLevelUpdated(float level);
-	void audioLevelsUpdated(
-		const std::vector<std::pair<std::uint32_t, float>> &data);
-	void handleLevelsUpdated(
-		gsl::span<const std::pair<std::uint32_t, float>> data);
+	void audioLevelsUpdated(const tgcalls::GroupLevelsUpdate &data);
 	void setInstanceConnected(bool connected);
 	void checkLastSpoke();
 	void pushToTalkCancel();
@@ -158,11 +174,15 @@ private:
 	void checkGlobalShortcutAvailability();
 	void checkJoined();
 
+	void playConnectingSound();
+	void stopConnectingSound();
+	void playConnectingSoundOnce();
+
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
 	const not_null<Delegate*> _delegate;
-	const not_null<ChannelData*> _channel;
-	const not_null<History*> _history;
+	not_null<PeerData*> _peer; // Can change in legacy group migration.
+	not_null<History*> _history; // Can change in legacy group migration.
 	MTP::Sender _api;
 	rpl::variable<State> _state = State::Creating;
 	bool _instanceConnected = false;
@@ -178,7 +198,7 @@ private:
 
 	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
 	rpl::event_stream<LevelUpdate> _levelUpdates;
-	base::flat_map<uint32, crl::time> _lastSpoke;
+	base::flat_map<uint32, Data::LastSpokeTimes> _lastSpoke;
 	base::Timer _lastSpokeCheckTimer;
 	base::Timer _checkJoinedTimer;
 
@@ -187,7 +207,12 @@ private:
 	std::shared_ptr<GlobalShortcutManager> _shortcutManager;
 	std::shared_ptr<GlobalShortcutValue> _pushToTalk;
 	base::Timer _pushToTalkCancelTimer;
-	bool _pushToTalkStarted = false;
+	base::Timer _connectingSoundTimer;
+	bool _hadJoinedState = false;
+
+	std::unique_ptr<Webrtc::MediaDevices> _mediaDevices;
+	QString _audioInputId;
+	QString _audioOutputId;
 
 	rpl::lifetime _lifetime;
 

Telegram/SourceFiles/calls/calls_group_members.cpp

@@ -9,10 +9,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "calls/calls_group_call.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
 #include "data/data_peer_values.h" // Data::CanWriteValue.
+#include "data/data_session.h" // Data::Session::invitedToCallUsers.
+#include "settings/settings_common.h" // Settings::CreateButton.
 #include "ui/paint/blobs.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
@@ -24,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h" // Core::App().domain().activate.
 #include "main/main_session.h"
 #include "base/timer.h"
-#include "boxes/peers/edit_participants_box.h"
+#include "boxes/peers/edit_participants_box.h" // SubscribeToMigration.
 #include "lang/lang_keys.h"
 #include "window/window_controller.h" // Controller::sessionController.
 #include "window/window_session_controller.h"
@@ -84,6 +87,7 @@ public:
 		Active,
 		Inactive,
 		Muted,
+		Invited,
 	};
 
 	void setSkipLevelUpdate(bool value);
@@ -96,6 +100,9 @@ public:
 	[[nodiscard]] uint32 ssrc() const {
 		return _ssrc;
 	}
+	[[nodiscard]] bool sounding() const {
+		return _sounding;
+	}
 	[[nodiscard]] bool speaking() const {
 		return _speaking;
 	}
@@ -112,7 +119,9 @@ public:
 			st::groupCallActiveButton.height);
 	}
 	bool actionDisabled() const override {
-		return peer()->isSelf() || !_delegate->rowCanMuteMembers();
+		return peer()->isSelf()
+			|| (_state == State::Invited)
+			|| !_delegate->rowCanMuteMembers();
 	}
 	QMargins actionMargins() const override {
 		return QMargins(
@@ -131,6 +140,15 @@ public:
 
 	auto generatePaintUserpicCallback() -> PaintRoundImageCallback override;
 
+	void paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) override;
+
 private:
 	struct BlobsAnimation {
 		BlobsAnimation(
@@ -146,7 +164,7 @@ private:
 
 		Ui::Paint::Blobs blobs;
 		crl::time lastTime = 0;
-		crl::time lastSpeakingUpdateTime = 0;
+		crl::time lastSoundingUpdateTime = 0;
 		float64 enter = 0.;
 
 		QImage userpicCache;
@@ -155,6 +173,7 @@ private:
 		rpl::lifetime lifetime;
 	};
 	void refreshStatus() override;
+	void setSounding(bool sounding);
 	void setSpeaking(bool speaking);
 	void setState(State state);
 	void setSsrc(uint32 ssrc);
@@ -171,6 +190,7 @@ private:
 	Ui::Animations::Simple _mutedAnimation; // For gray/red icon.
 	Ui::Animations::Simple _activeAnimation; // For icon cross animation.
 	uint32 _ssrc = 0;
+	bool _sounding = false;
 	bool _speaking = false;
 	bool _skipLevelUpdate = false;
 
@@ -217,6 +237,8 @@ private:
 	[[nodiscard]] std::unique_ptr<Row> createSelfRow();
 	[[nodiscard]] std::unique_ptr<Row> createRow(
 		const Data::GroupCall::Participant &participant);
+	[[nodiscard]] std::unique_ptr<Row> createInvitedRow(
+		not_null<UserData*> user);
 
 	void prepareRows(not_null<Data::GroupCall*> real);
 	//void repaintByTimer();
@@ -235,13 +257,15 @@ private:
 	Row *findRow(not_null<UserData*> user) const;
 
 	[[nodiscard]] Data::GroupCall *resolvedRealCall() const;
+	void appendInvitedUsers();
 
 	const base::weak_ptr<GroupCall> _call;
-	const not_null<ChannelData*> _channel;
+	not_null<PeerData*> _peer;
 
 	// Use only resolvedRealCall() method, not this value directly.
 	Data::GroupCall *_realCallRawValue = nullptr;
 	uint64 _realId = 0;
+	bool _prepared = false;
 
 	rpl::event_stream<MuteRequest> _toggleMuteRequests;
 	rpl::event_stream<not_null<UserData*>> _kickMemberRequests;
@@ -251,10 +275,10 @@ private:
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	base::flat_set<not_null<PeerData*>> _menuCheckRowsAfterHidden;
 
-	base::flat_map<uint32, not_null<Row*>> _speakingRowBySsrc;
-	Ui::Animations::Basic _speakingAnimation;
+	base::flat_map<uint32, not_null<Row*>> _soundingRowBySsrc;
+	Ui::Animations::Basic _soundingAnimation;
 
-	crl::time _speakingAnimationHideLastTime = 0;
+	crl::time _soundingAnimationHideLastTime = 0;
 	bool _skipRowLevelUpdate = false;
 
 	Ui::CrossLineAnimation _inactiveCrossLine;
@@ -277,22 +301,21 @@ void Row::setSkipLevelUpdate(bool value) {
 void Row::updateState(const Data::GroupCall::Participant *participant) {
 	setSsrc(participant ? participant->ssrc : 0);
 	if (!participant) {
-		if (peer()->isSelf()) {
-			setCustomStatus(tr::lng_group_call_connecting(tr::now));
-		} else {
-			setCustomStatus(QString());
-		}
-		setState(State::Inactive);
+		setState(State::Invited);
+		setSounding(false);
 		setSpeaking(false);
 	} else if (!participant->muted
-		|| (participant->speaking && participant->ssrc != 0)) {
+		|| (participant->sounding && participant->ssrc != 0)) {
 		setState(State::Active);
+		setSounding(participant->sounding && participant->ssrc != 0);
 		setSpeaking(participant->speaking && participant->ssrc != 0);
 	} else if (participant->canSelfUnmute) {
 		setState(State::Inactive);
+		setSounding(false);
 		setSpeaking(false);
 	} else {
 		setState(State::Muted);
+		setSounding(false);
 		setSpeaking(false);
 	}
 }
@@ -307,7 +330,14 @@ void Row::setSpeaking(bool speaking) {
 		_speaking ? 0. : 1.,
 		_speaking ? 1. : 0.,
 		st::widgetFadeDuration);
-	if (!_speaking) {
+}
+
+void Row::setSounding(bool sounding) {
+	if (_sounding == sounding) {
+		return;
+	}
+	_sounding = sounding;
+	if (!_sounding) {
 		_blobsAnimation = nullptr;
 	} else if (!_blobsAnimation) {
 		_blobsAnimation = std::make_unique<BlobsAnimation>(
@@ -357,7 +387,7 @@ void Row::updateLevel(float level) {
 	}
 
 	if (level >= GroupCall::kSpeakLevelThreshold) {
-		_blobsAnimation->lastSpeakingUpdateTime = crl::now();
+		_blobsAnimation->lastSoundingUpdateTime = crl::now();
 	}
 	_blobsAnimation->blobs.setLevel(level);
 }
@@ -365,14 +395,14 @@ void Row::updateLevel(float level) {
 void Row::updateBlobAnimation(crl::time now) {
 	Expects(_blobsAnimation != nullptr);
 
-	const auto speakingFinishesAt = _blobsAnimation->lastSpeakingUpdateTime
-		+ Data::GroupCall::kSpeakStatusKeptFor;
-	const auto speakingStartsFinishing = speakingFinishesAt
+	const auto soundingFinishesAt = _blobsAnimation->lastSoundingUpdateTime
+		+ Data::GroupCall::kSoundStatusKeptFor;
+	const auto soundingStartsFinishing = soundingFinishesAt
 		- kBlobsEnterDuration;
-	const auto speakingFinishes = (speakingStartsFinishing < now);
-	if (speakingFinishes) {
+	const auto soundingFinishes = (soundingStartsFinishing < now);
+	if (soundingFinishes) {
 		_blobsAnimation->enter = std::clamp(
-			(speakingFinishesAt - now) / float64(kBlobsEnterDuration),
+			(soundingFinishesAt - now) / float64(kBlobsEnterDuration),
 			0.,
 			1.);
 	} else if (_blobsAnimation->enter < 1.) {
@@ -417,8 +447,13 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		if (_blobsAnimation) {
 			const auto shift = QPointF(x + size / 2., y + size / 2.);
+			auto hq = PainterHighQualityEnabler(p);
 			p.translate(shift);
-			_blobsAnimation->blobs.paint(p, st::groupCallMemberActiveStatus);
+			const auto brush = anim::brush(
+				st::groupCallMemberInactiveStatus,
+				st::groupCallMemberActiveStatus,
+				_speakingAnimation.value(_speaking ? 1. : 0.));
+			_blobsAnimation->blobs.paint(p, brush);
 			p.translate(-shift);
 			p.setOpacity(1.);
 
@@ -454,6 +489,36 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	};
 }
 
+void Row::paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) {
+	if (_state != State::Invited) {
+		PeerListRow::paintStatusText(
+			p,
+			st,
+			x,
+			y,
+			availableWidth,
+			outerWidth,
+			selected);
+		return;
+	}
+	p.setFont(st::normalFont);
+	p.setPen(st::groupCallMemberNotJoinedStatus);
+	p.drawTextLeft(
+		x,
+		y,
+		outerWidth,
+		(peer()->isSelf()
+			? tr::lng_status_connecting(tr::now)
+			: tr::lng_group_call_invited_status(tr::now)));
+}
+
 void Row::paintAction(
 		Painter &p,
 		int x,
@@ -462,6 +527,20 @@ void Row::paintAction(
 		bool selected,
 		bool actionSelected) {
 	auto size = actionSize();
+	const auto iconRect = style::rtlrect(
+		x,
+		y,
+		size.width(),
+		size.height(),
+		outerWidth);
+	if (_state == State::Invited) {
+		_actionRipple = nullptr;
+		st::groupCallMemberInvited.paint(
+			p,
+			QPoint(x, y) + st::groupCallMemberInvitedPosition,
+			outerWidth);
+		return;
+	}
 	if (_actionRipple) {
 		_actionRipple->paint(
 			p,
@@ -472,12 +551,6 @@ void Row::paintAction(
 			_actionRipple.reset();
 		}
 	}
-	const auto iconRect = style::rtlrect(
-		x,
-		y,
-		size.width(),
-		size.height(),
-		outerWidth);
 	const auto speaking = _speakingAnimation.value(_speaking ? 1. : 0.);
 	const auto active = _activeAnimation.value(
 		(_state == State::Active) ? 1. : 0.);
@@ -517,7 +590,7 @@ MembersController::MembersController(
 	not_null<GroupCall*> call,
 	not_null<QWidget*> menuParent)
 : _call(call)
-, _channel(call->channel())
+, _peer(call->peer())
 , _menuParent(menuParent)
 , _inactiveCrossLine(st::groupCallMemberInactiveCrossLine)
 , _coloredCrossLine(st::groupCallMemberColoredCrossLine) {
@@ -535,28 +608,28 @@ MembersController::MembersController(
 	) | rpl::start_with_next([=](bool animDisabled, bool deactivated) {
 		const auto hide = !(!animDisabled && !deactivated);
 
-		if (!(hide && _speakingAnimationHideLastTime)) {
-			_speakingAnimationHideLastTime = hide ? crl::now() : 0;
+		if (!(hide && _soundingAnimationHideLastTime)) {
+			_soundingAnimationHideLastTime = hide ? crl::now() : 0;
 		}
-		for (const auto [_, row] : _speakingRowBySsrc) {
+		for (const auto [_, row] : _soundingRowBySsrc) {
 			if (hide) {
 				updateRowLevel(row, 0.);
 			}
 			row->setSkipLevelUpdate(hide);
 		}
-		if (!hide && !_speakingAnimation.animating()) {
-			_speakingAnimation.start();
+		if (!hide && !_soundingAnimation.animating()) {
+			_soundingAnimation.start();
 		}
 		_skipRowLevelUpdate = hide;
 	}, _lifetime);
 
-	_speakingAnimation.init([=](crl::time now) {
-		if (const auto &last = _speakingAnimationHideLastTime; (last > 0)
+	_soundingAnimation.init([=](crl::time now) {
+		if (const auto &last = _soundingAnimationHideLastTime; (last > 0)
 			&& (now - last >= kBlobsEnterDuration)) {
-			_speakingAnimation.stop();
+			_soundingAnimation.stop();
 			return false;
 		}
-		for (const auto [ssrc, row] : _speakingRowBySsrc) {
+		for (const auto [ssrc, row] : _soundingRowBySsrc) {
 			row->updateBlobAnimation(now);
 			delegate()->peerListUpdateRow(row);
 		}
@@ -572,12 +645,12 @@ MembersController::~MembersController() {
 }
 
 void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
-	const auto channel = call->channel();
-	channel->session().changes().peerFlagsValue(
-		channel,
+	const auto peer = call->peer();
+	peer->session().changes().peerFlagsValue(
+		peer,
 		Data::PeerUpdate::Flag::GroupCall
 	) | rpl::map([=] {
-		return channel->call();
+		return peer->groupCall();
 	}) | rpl::filter([=](Data::GroupCall *real) {
 		const auto call = _call.get();
 		return call && real && (real->id() == call->id());
@@ -590,7 +663,7 @@ void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 	call->stateValue(
 	) | rpl::start_with_next([=] {
 		const auto call = _call.get();
-		const auto real = channel->call();
+		const auto real = peer->groupCall();
 		if (call && real && (real->id() == call->id())) {
 			//updateRow(channel->session().user());
 		}
@@ -598,8 +671,8 @@ void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 
 	call->levelUpdates(
 	) | rpl::start_with_next([=](const LevelUpdate &update) {
-		const auto i = _speakingRowBySsrc.find(update.ssrc);
-		if (i != end(_speakingRowBySsrc)) {
+		const auto i = _soundingRowBySsrc.find(update.ssrc);
+		if (i != end(_soundingRowBySsrc)) {
 			updateRowLevel(i->second, update.value);
 		}
 	}, _lifetime);
@@ -627,6 +700,7 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 		const auto user = update.was ? update.was->user : update.now->user;
 		if (!update.now) {
 			if (const auto row = findRow(user)) {
+				const auto owner = &user->owner();
 				if (user->isSelf()) {
 					updateRow(row, nullptr);
 				} else {
@@ -638,6 +712,30 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 			updateRow(update.was, *update.now);
 		}
 	}, _lifetime);
+
+	if (_prepared) {
+		appendInvitedUsers();
+	}
+}
+
+void MembersController::appendInvitedUsers() {
+	for (const auto user : _peer->owner().invitedToCallUsers(_realId)) {
+		if (auto row = createInvitedRow(user)) {
+			delegate()->peerListAppendRow(std::move(row));
+		}
+	}
+	delegate()->peerListRefreshRows();
+
+	using Invite = Data::Session::InviteToCall;
+	_peer->owner().invitesToCalls(
+	) | rpl::filter([=](const Invite &invite) {
+		return (invite.id == _realId);
+	}) | rpl::start_with_next([=](const Invite &invite) {
+		if (auto row = createInvitedRow(invite.user)) {
+			delegate()->peerListAppendRow(std::move(row));
+			delegate()->peerListRefreshRows();
+		}
+	}, _lifetime);
 }
 
 void MembersController::updateRow(
@@ -697,41 +795,41 @@ void MembersController::checkSpeakingRowPosition(not_null<Row*> row) {
 void MembersController::updateRow(
 		not_null<Row*> row,
 		const Data::GroupCall::Participant *participant) {
-	const auto wasSpeaking = row->speaking();
+	const auto wasSounding = row->sounding();
 	const auto wasSsrc = row->ssrc();
 	row->setSkipLevelUpdate(_skipRowLevelUpdate);
 	row->updateState(participant);
-	const auto nowSpeaking = row->speaking();
+	const auto nowSounding = row->sounding();
 	const auto nowSsrc = row->ssrc();
 
-	const auto wasNoSpeaking = _speakingRowBySsrc.empty();
+	const auto wasNoSounding = _soundingRowBySsrc.empty();
 	if (wasSsrc == nowSsrc) {
-		if (nowSpeaking != wasSpeaking) {
-			if (nowSpeaking) {
-				_speakingRowBySsrc.emplace(nowSsrc, row);
+		if (nowSounding != wasSounding) {
+			if (nowSounding) {
+				_soundingRowBySsrc.emplace(nowSsrc, row);
 			} else {
-				_speakingRowBySsrc.remove(nowSsrc);
+				_soundingRowBySsrc.remove(nowSsrc);
 			}
 		}
 	} else {
-		_speakingRowBySsrc.remove(wasSsrc);
-		if (nowSpeaking) {
+		_soundingRowBySsrc.remove(wasSsrc);
+		if (nowSounding) {
 			Assert(nowSsrc != 0);
-			_speakingRowBySsrc.emplace(nowSsrc, row);
+			_soundingRowBySsrc.emplace(nowSsrc, row);
 		}
 	}
-	const auto nowNoSpeaking = _speakingRowBySsrc.empty();
-	if (wasNoSpeaking && !nowNoSpeaking) {
-		_speakingAnimation.start();
-	} else if (nowNoSpeaking && !wasNoSpeaking) {
-		_speakingAnimation.stop();
+	const auto nowNoSounding = _soundingRowBySsrc.empty();
+	if (wasNoSounding && !nowNoSounding) {
+		_soundingAnimation.start();
+	} else if (nowNoSounding && !wasNoSounding) {
+		_soundingAnimation.stop();
 	}
 
 	delegate()->peerListUpdateRow(row);
 }
 
 void MembersController::removeRow(not_null<Row*> row) {
-	_speakingRowBySsrc.remove(row->ssrc());
+	_soundingRowBySsrc.remove(row->ssrc());
 	delegate()->peerListRemoveRow(row);
 }
 
@@ -750,14 +848,14 @@ Row *MembersController::findRow(not_null<UserData*> user) const {
 
 Data::GroupCall *MembersController::resolvedRealCall() const {
 	return (_realCallRawValue
-		&& (_channel->call() == _realCallRawValue)
+		&& (_peer->groupCall() == _realCallRawValue)
 		&& (_realCallRawValue->id() == _realId))
 		? _realCallRawValue
 		: nullptr;
 }
 
 Main::Session &MembersController::session() const {
-	return _call->channel()->session();
+	return _call->peer()->session();
 }
 
 void MembersController::prepare() {
@@ -767,14 +865,19 @@ void MembersController::prepare() {
 	setSearchNoResultsText(tr::lng_blocked_list_not_found(tr::now));
 
 	const auto call = _call.get();
-	if (const auto real = _channel->call();
+	if (const auto real = _peer->groupCall();
 		real && call && real->id() == call->id()) {
 		prepareRows(real);
 	} else if (auto row = createSelfRow()) {
 		delegate()->peerListAppendRow(std::move(row));
 		delegate()->peerListRefreshRows();
 	}
+
 	loadMoreRows();
+	if (_realId) {
+		appendInvitedUsers();
+	}
+	_prepared = true;
 }
 
 void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
@@ -803,10 +906,10 @@ void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
 		}
 	}
 	if (!foundSelf) {
-		const auto self = _channel->session().user();
+		const auto self = _peer->session().user();
 		const auto i = ranges::find(
 			participants,
-			_channel->session().user(),
+			_peer->session().user(),
 			&Data::GroupCall::Participant::user);
 		auto row = (i != end(participants)) ? createRow(*i) : createSelfRow();
 		if (row) {
@@ -826,7 +929,7 @@ void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
 }
 
 void MembersController::loadMoreRows() {
-	if (const auto real = _channel->call()) {
+	if (const auto real = _peer->groupCall()) {
 		real->requestParticipants();
 	}
 }
@@ -837,7 +940,7 @@ auto MembersController::toggleMuteRequests() const
 }
 
 bool MembersController::rowCanMuteMembers() {
-	return _channel->canManageCall();
+	return _peer->canManageGroupCall();
 }
 
 void MembersController::rowUpdateRow(not_null<Row*> row) {
@@ -943,7 +1046,29 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		parent,
 		st::groupCallPopupMenu);
 
-	const auto mute = (real->state() != Row::State::Muted);
+	const auto muteState = real->state();
+	const auto admin = [&] {
+		if (const auto chat = _peer->asChat()) {
+			return chat->admins.contains(user)
+				|| (chat->creator == user->bareId());
+		} else if (const auto group = _peer->asMegagroup()) {
+			if (const auto mgInfo = group->mgInfo.get()) {
+				if (mgInfo->creator == user) {
+					return true;
+				}
+				const auto i = mgInfo->lastAdmins.find(user);
+				if (i == mgInfo->lastAdmins.end()) {
+					return false;
+				}
+				const auto &rights = i->second.rights;
+				return rights.c_chatAdminRights().is_manage_call();
+			}
+		}
+		return false;
+	}();
+	const auto mute = admin
+		? (muteState == Row::State::Active)
+		: (muteState != Row::State::Muted);
 	const auto toggleMute = crl::guard(this, [=] {
 		_toggleMuteRequests.fire(MuteRequest{
 			.user = user,
@@ -991,14 +1116,16 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 	};
 	const auto showHistory = [=] {
 		performOnMainWindow([=](not_null<Window::SessionController*> window) {
-			window->showPeerHistory(user);
+			window->showPeerHistory(
+				user,
+				Window::SectionShow::Way::Forward);
 		});
 	};
 	const auto removeFromGroup = crl::guard(this, [=] {
 		_kickMemberRequests.fire_copy(user);
 	});
 
-	if (_channel->canManageCall()) {
+	if (_peer->canManageGroupCall() && (!admin || mute)) {
 		result->addAction(
 			(mute
 				? tr::lng_group_call_context_mute(tr::now)
@@ -1011,7 +1138,18 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 	result->addAction(
 		tr::lng_context_send_message(tr::now),
 		showHistory);
-	if (_channel->canRestrictUser(user)) {
+	const auto canKick = [&] {
+		if (static_cast<Row*>(row.get())->state() == Row::State::Invited) {
+			return false;
+		} else if (const auto chat = _peer->asChat()) {
+			return chat->amCreator()
+				|| (chat->canBanMembers() && !chat->admins.contains(user));
+		} else if (const auto group = _peer->asMegagroup()) {
+			return group->canRestrictUser(user);
+		}
+		return false;
+	}();
+	if (canKick) {
 		result->addAction(
 			tr::lng_context_remove_from_group(tr::now),
 			removeFromGroup);
@@ -1020,7 +1158,7 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 }
 
 std::unique_ptr<Row> MembersController::createSelfRow() {
-	const auto self = _channel->session().user();
+	const auto self = _peer->session().user();
 	auto result = std::make_unique<Row>(this, self);
 	updateRow(result.get(), nullptr);
 	return result;
@@ -1033,6 +1171,16 @@ std::unique_ptr<Row> MembersController::createRow(
 	return result;
 }
 
+std::unique_ptr<Row> MembersController::createInvitedRow(
+		not_null<UserData*> user) {
+	if (findRow(user)) {
+		return nullptr;
+	}
+	auto result = std::make_unique<Row>(this, user);
+	updateRow(result.get(), nullptr);
+	return result;
+}
+
 } // namespace
 
 GroupMembers::GroupMembers(
@@ -1042,20 +1190,11 @@ GroupMembers::GroupMembers(
 , _call(call)
 , _scroll(this, st::defaultSolidScroll)
 , _listController(std::make_unique<MembersController>(call, parent)) {
-	setupHeader(call);
+	setupAddMember(call);
 	setupList();
 	setContent(_list);
 	setupFakeRoundCorners();
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
-
-	paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
-		const auto headerPart = clip.intersected(
-			QRect(0, 0, width(), _header->height()));
-		if (!headerPart.isEmpty()) {
-			QPainter(this).fillRect(headerPart, st::groupCallMembersBg);
-		}
-	}, lifetime());
 }
 
 auto GroupMembers::toggleMuteRequests() const
@@ -1071,10 +1210,10 @@ auto GroupMembers::kickMemberRequests() const
 }
 
 int GroupMembers::desiredHeight() const {
-	auto desired = _header ? _header->height() : 0;
+	const auto top = _addMember ? _addMember->height() : 0;
 	auto count = [&] {
 		if (const auto call = _call.get()) {
-			if (const auto real = call->channel()->call()) {
+			if (const auto real = call->peer()->groupCall()) {
 				if (call->id() == real->id()) {
 					return real->fullCount();
 				}
@@ -1083,7 +1222,7 @@ int GroupMembers::desiredHeight() const {
 		return 0;
 	}();
 	const auto use = std::max(count, _list->fullRowsCount());
-	return (_header ? _header->height() : 0)
+	return top
 		+ (use * st::groupCallMembersList.item.height)
 		+ (use ? st::lineWidth : 0);
 }
@@ -1093,111 +1232,107 @@ rpl::producer<int> GroupMembers::desiredHeightValue() const {
 		_listController.get());
 	return rpl::combine(
 		heightValue(),
+		_addMemberButton.value(),
 		controller->fullCountValue()
 	) | rpl::map([=] {
 		return desiredHeight();
 	});
 }
 
-void GroupMembers::setupHeader(not_null<GroupCall*> call) {
-	_header = object_ptr<Ui::FixedHeightWidget>(
-		this,
-		st::groupCallMembersHeader);
-	auto parent = _header.data();
-
-	_titleWrap = Ui::CreateChild<Ui::RpWidget>(parent);
-	_title = setupTitle(call);
-	_addMember = Ui::CreateChild<Ui::IconButton>(
-		parent,
-		st::groupCallAddMember);
-	setupButtons(call);
-
-	widthValue(
-	) | rpl::start_with_next([this](int width) {
-		_header->resizeToWidth(width);
-	}, _header->lifetime());
-}
-
-object_ptr<Ui::FlatLabel> GroupMembers::setupTitle(
-		not_null<GroupCall*> call) {
-	const auto controller = static_cast<MembersController*>(
-		_listController.get());
-	auto result = object_ptr<Ui::FlatLabel>(
-		_titleWrap,
-		tr::lng_chat_status_members(
-			lt_count_decimal,
-			controller->fullCountValue() | tr::to_count(),
-			Ui::Text::Upper
-		),
-		st::groupCallHeaderLabel);
-	result->setAttribute(Qt::WA_TransparentForMouseEvents);
-	return result;
-}
-
-void GroupMembers::setupButtons(not_null<GroupCall*> call) {
+void GroupMembers::setupAddMember(not_null<GroupCall*> call) {
 	using namespace rpl::mappers;
 
-	_addMember->showOn(Data::CanWriteValue(
-		call->channel().get()
-	));
-	_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
-		_addMemberRequests.fire({});
-	});
+	_canAddMembers = Data::CanWriteValue(call->peer().get());
+	SubscribeToMigration(
+		call->peer(),
+		lifetime(),
+		[=](not_null<ChannelData*> channel) {
+			_canAddMembers = Data::CanWriteValue(channel.get());
+		});
+
+	_canAddMembers.value(
+	) | rpl::start_with_next([=](bool can) {
+		if (!can) {
+			_addMemberButton = nullptr;
+			_addMember.destroy();
+			updateControlsGeometry();
+			return;
+		}
+		_addMember = Settings::CreateButton(
+			this,
+			tr::lng_group_call_invite(),
+			st::groupCallAddMember,
+			&st::groupCallAddMemberIcon,
+			st::groupCallAddMemberIconLeft);
+		_addMember->show();
+
+		_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
+			_addMemberRequests.fire({});
+		});
+		_addMemberButton = _addMember.data();
+
+		resizeToList();
+	}, lifetime());
 }
 
-void GroupMembers::setupList() {
-	auto topSkip = _header ? _header->height() : 0;
+rpl::producer<int> GroupMembers::fullCountValue() const {
+	return static_cast<MembersController*>(
+		_listController.get())->fullCountValue();
+}
 
+//tr::lng_chat_status_members(
+//	lt_count_decimal,
+//	controller->fullCountValue() | tr::to_count(),
+//	Ui::Text::Upper
+//),
+
+void GroupMembers::setupList() {
 	_listController->setStyleOverrides(&st::groupCallMembersList);
 	_list = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
 		_listController.get()));
 
-	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
-		_scroll->setGeometry(0, topSkip, size.width(), size.height() - topSkip);
-		_list->resizeToWidth(size.width());
+	_list->heightValue(
+	) | rpl::start_with_next([=] {
+		resizeToList();
 	}, _list->lifetime());
 
-	_list->heightValue(
-	) | rpl::start_with_next([=](int listHeight) {
-		auto newHeight = (listHeight > 0)
-			? (topSkip + listHeight + st::lineWidth)
-			: 0;
-		resize(width(), newHeight);
-	}, _list->lifetime());
-	_list->moveToLeft(0, topSkip);
-	_list->show();
+	updateControlsGeometry();
 }
 
 void GroupMembers::resizeEvent(QResizeEvent *e) {
-	if (_header) {
-		updateHeaderControlsGeometry(width());
+	updateControlsGeometry();
+}
+
+void GroupMembers::resizeToList() {
+	if (!_list) {
+		return;
+	}
+	const auto listHeight = _list->height();
+	const auto newHeight = (listHeight > 0)
+		? ((_addMember ? _addMember->height() : 0)
+			+ listHeight
+			+ st::lineWidth)
+		: 0;
+	if (height() == newHeight) {
+		updateControlsGeometry();
+	} else {
+		resize(width(), newHeight);
 	}
 }
 
-void GroupMembers::updateHeaderControlsGeometry(int newWidth) {
-	auto availableWidth = newWidth
-		- st::groupCallAddButtonPosition.x();
-	_addMember->moveToLeft(
-		availableWidth - _addMember->width(),
-		st::groupCallAddButtonPosition.y(),
-		newWidth);
-	if (!_addMember->isHidden()) {
-		availableWidth -= _addMember->width();
+void GroupMembers::updateControlsGeometry() {
+	if (!_list) {
+		return;
 	}
-
-	_titleWrap->resize(
-		availableWidth - _addMember->width() - st::groupCallHeaderPosition.x(),
-		_title->height());
-	_titleWrap->moveToLeft(
-		st::groupCallHeaderPosition.x(),
-		st::groupCallHeaderPosition.y(),
-		newWidth);
-	_titleWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-	_title->resizeToWidth(_titleWrap->width());
-	_title->moveToLeft(0, 0);
+	auto topSkip = 0;
+	if (_addMember) {
+		_addMember->resizeToWidth(width());
+		_addMember->move(0, 0);
+		topSkip = _addMember->height();
+	}
+	_scroll->setGeometry(0, topSkip, width(), height() - topSkip);
+	_list->resizeToWidth(width());
 }
 
 void GroupMembers::setupFakeRoundCorners() {

Telegram/SourceFiles/calls/calls_group_members.h

@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 class ScrollArea;
+class SettingsButton;
 } // namespace Ui
 
 namespace Data {
@@ -36,6 +37,7 @@ public:
 
 	[[nodiscard]] int desiredHeight() const;
 	[[nodiscard]] rpl::producer<int> desiredHeightValue() const override;
+	[[nodiscard]] rpl::producer<int> fullCountValue() const;
 	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
 	[[nodiscard]] auto kickMemberRequests() const
 		-> rpl::producer<not_null<UserData*>>;
@@ -67,25 +69,22 @@ private:
 	void peerListSetDescription(
 		object_ptr<Ui::FlatLabel> description) override;
 
-	void setupHeader(not_null<GroupCall*> call);
-	object_ptr<Ui::FlatLabel> setupTitle(not_null<GroupCall*> call);
+	void setupAddMember(not_null<GroupCall*> call);
+	void resizeToList();
 	void setupList();
 	void setupFakeRoundCorners();
 
-	void setupButtons(not_null<GroupCall*> call);
-
-	void updateHeaderControlsGeometry(int newWidth);
+	void updateControlsGeometry();
 
 	const base::weak_ptr<GroupCall> _call;
 	object_ptr<Ui::ScrollArea> _scroll;
 	std::unique_ptr<PeerListController> _listController;
-	object_ptr<Ui::RpWidget> _header = { nullptr };
+	object_ptr<Ui::SettingsButton> _addMember = { nullptr };
+	rpl::variable<Ui::SettingsButton*> _addMemberButton = nullptr;
 	ListWidget *_list = { nullptr };
 	rpl::event_stream<> _addMemberRequests;
 
-	Ui::RpWidget *_titleWrap = nullptr;
-	Ui::FlatLabel *_title = nullptr;
-	Ui::IconButton *_addMember = nullptr;
+	rpl::variable<bool> _canAddMembers;
 
 };
 

Telegram/SourceFiles/calls/calls_group_panel.cpp

@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "lang/lang_keys.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_group_call.h"
 #include "data/data_session.h"
@@ -44,10 +45,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
+constexpr auto kSpacePushToTalkDelay = crl::time(250);
+
 class InviteController final : public ParticipantsBoxController {
 public:
 	InviteController(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		base::flat_set<not_null<UserData*>> alreadyIn,
 		int fullInCount);
 
@@ -65,7 +68,6 @@ public:
 		not_null<GroupCall*> call) const;
 
 private:
-	void updateTitle() const;
 	[[nodiscard]] int alreadyInCount() const;
 	[[nodiscard]] bool isAlreadyIn(not_null<UserData*> user) const;
 	[[nodiscard]] int fullCount() const;
@@ -73,7 +75,7 @@ private:
 	std::unique_ptr<PeerListRow> createRow(
 		not_null<UserData*> user) const override;
 
-	const not_null<ChannelData*> _channel;
+	not_null<PeerData*> _peer;
 	const base::flat_set<not_null<UserData*>> _alreadyIn;
 	const int _fullInCount = 0;
 	mutable base::flat_set<not_null<UserData*>> _skippedUsers;
@@ -81,24 +83,27 @@ private:
 };
 
 InviteController::InviteController(
-	not_null<ChannelData*> channel,
+	not_null<PeerData*> peer,
 	base::flat_set<not_null<UserData*>> alreadyIn,
 	int fullInCount)
-: ParticipantsBoxController(CreateTag{}, nullptr, channel, Role::Members)
-, _channel(channel)
+: ParticipantsBoxController(CreateTag{}, nullptr, peer, Role::Members)
+, _peer(peer)
 , _alreadyIn(std::move(alreadyIn))
 , _fullInCount(std::max(fullInCount, int(_alreadyIn.size()))) {
-	_skippedUsers.emplace(channel->session().user());
+	_skippedUsers.emplace(peer->session().user());
+	SubscribeToMigration(
+		_peer,
+		lifetime(),
+		[=](not_null<ChannelData*> channel) { _peer = channel; });
 }
 
 void InviteController::prepare() {
 	ParticipantsBoxController::prepare();
-	updateTitle();
+	delegate()->peerListSetTitle(tr::lng_group_call_invite_title());
 }
 
 void InviteController::rowClicked(not_null<PeerListRow*> row) {
 	delegate()->peerListSetRowChecked(row, !row->checked());
-	updateTitle();
 }
 
 base::unique_qptr<Ui::PopupMenu> InviteController::rowContextMenu(
@@ -108,7 +113,6 @@ base::unique_qptr<Ui::PopupMenu> InviteController::rowContextMenu(
 }
 
 void InviteController::itemDeselectedHook(not_null<PeerData*> peer) {
-	updateTitle();
 }
 
 int InviteController::alreadyInCount() const {
@@ -126,9 +130,7 @@ int InviteController::fullCount() const {
 std::unique_ptr<PeerListRow> InviteController::createRow(
 		not_null<UserData*> user) const {
 	if (user->isSelf() || user->isBot()) {
-		if (_skippedUsers.emplace(user).second) {
-			updateTitle();
-		}
+		_skippedUsers.emplace(user);
 		return nullptr;
 	}
 	auto result = std::make_unique<PeerListRow>(user);
@@ -138,20 +140,6 @@ std::unique_ptr<PeerListRow> InviteController::createRow(
 	return result;
 }
 
-void InviteController::updateTitle() const {
-	const auto inOrInvited = fullCount() - 1; // minus self
-	const auto canBeInvited = std::max({
-		delegate()->peerListFullRowsCount(), // minus self and bots
-		_channel->membersCount() - int(_skippedUsers.size()), // self + bots
-		inOrInvited
-	});
-	const auto additional = canBeInvited
-		? qsl("%1 / %2").arg(inOrInvited).arg(canBeInvited)
-		: QString();
-	delegate()->peerListSetTitle(tr::lng_group_call_invite_title());
-	delegate()->peerListSetAdditionalTitle(rpl::single(additional));
-}
-
 std::variant<int, not_null<UserData*>> InviteController::inviteSelectedUsers(
 		not_null<PeerListBox*> box,
 		not_null<GroupCall*> call) const {
@@ -180,7 +168,7 @@ void LeaveGroupCallBox(
 		box.get(),
 		tr::lng_group_call_leave_sure(),
 		(inCall ? st::groupCallBoxLabel : st::boxLabel)));
-	const auto discard = call->channel()->canManageCall()
+	const auto discard = call->peer()->canManageGroupCall()
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box.get(),
 			tr::lng_group_call_end(),
@@ -211,7 +199,7 @@ void LeaveGroupCallBox(
 
 GroupPanel::GroupPanel(not_null<GroupCall*> call)
 : _call(call)
-, _channel(call->channel())
+, _peer(call->peer())
 , _window(std::make_unique<Ui::Window>(Core::App().getModalParent()))
 , _layerBg(std::make_unique<Ui::LayerManager>(_window->body()))
 #ifdef Q_OS_WIN
@@ -232,6 +220,11 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
 	_settings->setColorOverrides(_mute->colorOverrides());
 
+	SubscribeToMigration(
+		_peer,
+		_window->lifetime(),
+		[=](not_null<ChannelData*> channel) { migrate(channel); });
+
 	initWindow();
 	initWidget();
 	initControls();
@@ -251,29 +244,53 @@ void GroupPanel::showAndActivate() {
 	if (_window->isHidden()) {
 		_window->show();
 	}
+	const auto state = _window->windowState();
+	if (state & Qt::WindowMinimized) {
+		_window->setWindowState(state & ~Qt::WindowMinimized);
+	}
 	_window->raise();
-	_window->setWindowState(_window->windowState() | Qt::WindowActive);
 	_window->activateWindow();
 	_window->setFocus();
 }
 
+void GroupPanel::migrate(not_null<ChannelData*> channel) {
+	_peer = channel;
+	_peerLifetime.destroy();
+	subscribeToPeerChanges();
+	_title.destroy();
+	refreshTitle();
+}
+
+void GroupPanel::subscribeToPeerChanges() {
+	Info::Profile::NameValue(
+		_peer
+	) | rpl::start_with_next([=](const TextWithEntities &name) {
+		_window->setTitle(name.text);
+	}, _peerLifetime);
+}
+
 void GroupPanel::initWindow() {
 	_window->setAttribute(Qt::WA_OpaquePaintEvent);
 	_window->setAttribute(Qt::WA_NoSystemBackground);
 	_window->setWindowIcon(
 		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
-	_window->setTitleStyle(st::callTitle);
+	_window->setTitleStyle(st::groupCallTitle);
 
-	Info::Profile::NameValue(
-		_channel
-	) | rpl::start_with_next([=](const TextWithEntities &name) {
-		_window->setTitle(name.text);
-	}, _window->lifetime());
+	subscribeToPeerChanges();
 
 	base::install_event_filter(_window.get(), [=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close && handleClose()) {
 			e->ignore();
 			return base::EventFilterResult::Cancel;
+		} else if (e->type() == QEvent::KeyPress
+			|| e->type() == QEvent::KeyRelease) {
+			if (static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Space) {
+				if (_call) {
+					_call->pushToTalk(
+						e->type() == QEvent::KeyPress,
+						kSpacePushToTalkDelay);
+				}
+			}
 		}
 		return base::EventFilterResult::Continue;
 	});
@@ -309,30 +326,35 @@ void GroupPanel::initWidget() {
 	}, widget()->lifetime());
 }
 
-void GroupPanel::hangup(bool discardCallChecked) {
+void GroupPanel::endCall() {
 	if (!_call) {
 		return;
+	} else if (!_call->peer()->canManageGroupCall()) {
+		_call->hangup();
+		return;
 	}
 	_layerBg->showBox(Box(
 		LeaveGroupCallBox,
 		_call,
-		discardCallChecked,
+		false,
 		BoxContext::GroupCallPanel));
 }
 
 void GroupPanel::initControls() {
 	_mute->clicks(
 	) | rpl::filter([=](Qt::MouseButton button) {
-		return (button == Qt::LeftButton)
-			&& _call
-			&& (_call->muted() != MuteState::ForceMuted);
+		return (button == Qt::LeftButton) && (_call != nullptr);
 	}) | rpl::start_with_next([=] {
-		_call->setMuted((_call->muted() == MuteState::Muted)
-			? MuteState::Active
-			: MuteState::Muted);
+		if (_call->muted() == MuteState::ForceMuted) {
+			_mute->shake();
+		} else {
+			_call->setMuted((_call->muted() == MuteState::Muted)
+				? MuteState::Active
+				: MuteState::Muted);
+		}
 	}, _mute->lifetime());
 
-	_hangup->setClickedCallback([=] { hangup(false); });
+	_hangup->setClickedCallback([=] { endCall(); });
 	_settings->setClickedCallback([=] {
 		if (_call) {
 			_layerBg->showBox(Box(GroupCallSettingsBox, _call));
@@ -357,7 +379,7 @@ void GroupPanel::initWithCall(GroupCall *call) {
 		return;
 	}
 
-	_channel = _call->channel();
+	_peer = _call->peer();
 
 	call->stateValue(
 	) | rpl::filter([](State state) {
@@ -395,14 +417,9 @@ void GroupPanel::initWithCall(GroupCall *call) {
 		}
 	}, _callLifetime);
 
-	using namespace rpl::mappers;
 	rpl::combine(
 		_call->mutedValue() | MapPushToTalkToActive(),
-		_call->stateValue() | rpl::map(
-			_1 == State::Creating
-			|| _1 == State::Joining
-			|| _1 == State::Connecting
-		)
+		_call->connectingValue()
 	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](MuteState mute, bool connecting) {
 		_mute->setState(Ui::CallMuteButtonState{
@@ -413,6 +430,13 @@ void GroupPanel::initWithCall(GroupCall *call) {
 				: mute == MuteState::Muted
 				? tr::lng_group_call_unmute(tr::now)
 				: tr::lng_group_call_you_are_live(tr::now)),
+			.subtext = (connecting
+				? QString()
+				: mute == MuteState::ForceMuted
+				? tr::lng_group_call_force_muted_sub(tr::now)
+				: mute == MuteState::Muted
+				? tr::lng_group_call_unmute_sub(tr::now)
+				: QString()),
 			.type = (connecting
 				? Ui::CallMuteButtonType::Connecting
 				: mute == MuteState::ForceMuted
@@ -425,17 +449,17 @@ void GroupPanel::initWithCall(GroupCall *call) {
 }
 
 void GroupPanel::addMembers() {
-	const auto real = _channel->call();
+	const auto real = _peer->groupCall();
 	if (!_call || !real || real->id() != _call->id()) {
 		return;
 	}
-	auto alreadyIn = _channel->owner().invitedToCallUsers(real->id());
+	auto alreadyIn = _peer->owner().invitedToCallUsers(real->id());
 	for (const auto &participant : real->participants()) {
 		alreadyIn.emplace(participant.user);
 	}
-	alreadyIn.emplace(_channel->session().user());
+	alreadyIn.emplace(_peer->session().user());
 	auto controller = std::make_unique<InviteController>(
-		_channel,
+		_peer,
 		std::move(alreadyIn),
 		real->fullCount());
 	controller->setStyleOverrides(
@@ -508,17 +532,21 @@ void GroupPanel::kickMember(not_null<UserData*> user) {
 }
 
 void GroupPanel::kickMemberSure(not_null<UserData*> user) {
-	const auto currentRestrictedRights = [&]() -> MTPChatBannedRights {
-		const auto it = _channel->mgInfo->lastRestricted.find(user);
-		return (it != _channel->mgInfo->lastRestricted.cend())
-			? it->second.rights
-			: MTP_chatBannedRights(MTP_flags(0), MTP_int(0));
-	}();
+	if (const auto chat = _peer->asChat()) {
+		chat->session().api().kickParticipant(chat, user);
+	} else if (const auto channel = _peer->asChannel()) {
+		const auto currentRestrictedRights = [&]() -> MTPChatBannedRights {
+			const auto it = channel->mgInfo->lastRestricted.find(user);
+			return (it != channel->mgInfo->lastRestricted.cend())
+				? it->second.rights
+				: MTP_chatBannedRights(MTP_flags(0), MTP_int(0));
+		}();
 
-	_channel->session().api().kickParticipant(
-		_channel,
-		user,
-		currentRestrictedRights);
+		channel->session().api().kickParticipant(
+			channel,
+			user,
+			currentRestrictedRights);
+	}
 }
 
 void GroupPanel::initLayout() {
@@ -550,22 +578,22 @@ void GroupPanel::initGeometry() {
 }
 
 int GroupPanel::computeMembersListTop() const {
-#ifdef Q_OS_WIN
-	return st::callTitleButton.height + st::groupCallMembersMargin.top() / 2;
-#elif defined Q_OS_MAC // Q_OS_WIN
-	return st::groupCallMembersMargin.top() * 2;
-#else // Q_OS_WIN || Q_OS_MAC
-	return st::groupCallMembersMargin.top();
-#endif // Q_OS_WIN || Q_OS_MAC
+	if (computeTitleRect().has_value()) {
+		return st::groupCallMembersTop;
+	}
+	return st::groupCallMembersTop
+		- (st::groupCallSubtitleTop - st::groupCallTitleTop);
 }
 
 std::optional<QRect> GroupPanel::computeTitleRect() const {
 #ifdef Q_OS_WIN
 	const auto controls = _controls->geometry();
 	return QRect(0, 0, controls.x(), controls.height());
-#else // Q_OS_WIN
+#elif defined Q_OS_MAC // Q_OS_WIN
+	return QRect(70, 0, widget()->width() - 70, 28);
+#else // Q_OS_WIN || Q_OS_MAC
 	return std::nullopt;
-#endif // Q_OS_WIN
+#endif // Q_OS_WIN || Q_OS_MAC
 }
 
 void GroupPanel::updateControlsGeometry() {
@@ -609,13 +637,14 @@ void GroupPanel::refreshTitle() {
 		if (!_title) {
 			_title.create(
 				widget(),
-				Info::Profile::NameValue(_channel),
-				st::groupCallHeaderLabel);
+				Info::Profile::NameValue(_peer),
+				st::groupCallTitleLabel);
+			_title->show();
 			_title->setAttribute(Qt::WA_TransparentForMouseEvents);
 		}
 		const auto best = _title->naturalWidth();
 		const auto from = (widget()->width() - best) / 2;
-		const auto top = (computeMembersListTop() - _title->height()) / 2;
+		const auto top = st::groupCallTitleTop;
 		const auto left = titleRect->x();
 		if (from >= left && from + best <= left + titleRect->width()) {
 			_title->resizeToWidth(best);
@@ -633,6 +662,25 @@ void GroupPanel::refreshTitle() {
 	} else if (_title) {
 		_title.destroy();
 	}
+	if (!_subtitle) {
+		_subtitle.create(
+			widget(),
+			tr::lng_group_call_members(
+				lt_count_decimal,
+				_members->fullCountValue() | tr::to_count()),
+			st::groupCallSubtitleLabel);
+		_subtitle->show();
+		_subtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+	const auto middle = _title
+		? (_title->x() + _title->width() / 2)
+		: (widget()->width() / 2);
+	const auto top = _title
+		? st::groupCallSubtitleTop
+		: st::groupCallTitleTop;
+	_subtitle->moveToLeft(
+		(widget()->width() - _subtitle->width()) / 2,
+		top);
 }
 
 void GroupPanel::paint(QRect clip) {

Telegram/SourceFiles/calls/calls_group_panel.h

@@ -90,7 +90,7 @@ private:
 	void updateControlsGeometry();
 	void showControls();
 
-	void hangup(bool discardCallChecked);
+	void endCall();
 
 	void addMembers();
 	void kickMember(not_null<UserData*> user);
@@ -99,8 +99,11 @@ private:
 	[[nodiscard]] std::optional<QRect> computeTitleRect() const;
 	void refreshTitle();
 
+	void migrate(not_null<ChannelData*> channel);
+	void subscribeToPeerChanges();
+
 	GroupCall *_call = nullptr;
-	not_null<ChannelData*> _channel;
+	not_null<PeerData*> _peer;
 
 	const std::unique_ptr<Ui::Window> _window;
 	const std::unique_ptr<Ui::LayerManager> _layerBg;
@@ -112,12 +115,15 @@ private:
 	rpl::lifetime _callLifetime;
 
 	object_ptr<Ui::FlatLabel> _title = { nullptr };
+	object_ptr<Ui::FlatLabel> _subtitle = { nullptr };
 	object_ptr<GroupMembers> _members;
 
 	object_ptr<Ui::CallButton> _settings;
 	std::unique_ptr<Ui::CallMuteButton> _mute;
 	object_ptr<Ui::CallButton> _hangup;
 
+	rpl::lifetime _peerLifetime;
+
 };
 
 } // namespace Calls

Telegram/SourceFiles/calls/calls_group_settings.cpp

@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/global_shortcuts.h"
 #include "base/platform/base_platform_info.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_group_call.h"
 #include "core/application.h"
 #include "boxes/single_choice_box.h"
@@ -44,19 +45,19 @@ constexpr auto kDelaysCount = 201;
 constexpr auto kCheckAccessibilityInterval = crl::time(500);
 
 void SaveCallJoinMuted(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		uint64 callId,
 		bool joinMuted) {
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	if (!call
 		|| call->id() != callId
-		|| !channel->canManageCall()
+		|| !peer->canManageGroupCall()
 		|| !call->canChangeJoinMuted()
 		|| call->joinMuted() == joinMuted) {
 		return;
 	}
 	call->setJoinMutedLocally(joinMuted);
-	channel->session().api().request(MTPphone_ToggleGroupCallSettings(
+	peer->session().api().request(MTPphone_ToggleGroupCallSettings(
 		MTP_flags(MTPphone_ToggleGroupCallSettings::Flag::f_join_muted),
 		call->input(),
 		MTP_bool(joinMuted)
@@ -101,8 +102,8 @@ void GroupCallSettingsBox(
 	};
 	const auto state = box->lifetime().make_state<State>();
 
-	const auto channel = call->channel();
-	const auto real = channel->call();
+	const auto peer = call->peer();
+	const auto real = peer->groupCall();
 	const auto id = call->id();
 	const auto goodReal = (real && real->id() == id);
 
@@ -111,7 +112,7 @@ void GroupCallSettingsBox(
 
 	const auto joinMuted = goodReal ? real->joinMuted() : false;
 	const auto canChangeJoinMuted = (goodReal && real->canChangeJoinMuted());
-	const auto addCheck = (channel->canManageCall() && canChangeJoinMuted);
+	const auto addCheck = (peer->canManageGroupCall() && canChangeJoinMuted);
 	if (addCheck) {
 		AddSkip(layout);
 	}
@@ -402,11 +403,24 @@ void GroupCallSettingsBox(
 	//AddSkip(layout);
 
 	const auto lookupLink = [=] {
-		return channel->hasUsername()
-			? channel->session().createInternalLinkFull(channel->username)
-			: channel->inviteLink();
+		if (const auto group = peer->asMegagroup()) {
+			return group->hasUsername()
+				? group->session().createInternalLinkFull(group->username)
+				: group->inviteLink();
+		} else if (const auto chat = peer->asChat()) {
+			return chat->inviteLink();
+		}
+		return QString();
 	};
-	if (!lookupLink().isEmpty() || channel->canHaveInviteLink()) {
+	const auto canCreateLink = [&] {
+		if (const auto chat = peer->asChat()) {
+			return chat->canHaveInviteLink();
+		} else if (const auto group = peer->asMegagroup()) {
+			return group->canHaveInviteLink();
+		}
+		return false;
+	};
+	if (!lookupLink().isEmpty() || canCreateLink()) {
 		const auto copyLink = [=] {
 			const auto link = lookupLink();
 			if (link.isEmpty()) {
@@ -427,12 +441,17 @@ void GroupCallSettingsBox(
 		)->addClickHandler([=] {
 			if (!copyLink() && !state->generatingLink) {
 				state->generatingLink = true;
-				channel->session().api().request(MTPmessages_ExportChatInvite(
-					channel->input
+				peer->session().api().request(MTPmessages_ExportChatInvite(
+					peer->input
 				)).done([=](const MTPExportedChatInvite &result) {
 					if (result.type() == mtpc_chatInviteExported) {
-						channel->setInviteLink(
-							qs(result.c_chatInviteExported().vlink()));
+						const auto link = qs(
+							result.c_chatInviteExported().vlink());
+						if (const auto chat = peer->asChat()) {
+							chat->setInviteLink(link);
+						} else if (const auto channel = peer->asChannel()) {
+							channel->setInviteLink(link);
+						}
 						copyLink();
 					}
 				}).send();
@@ -440,7 +459,7 @@ void GroupCallSettingsBox(
 		});
 	}
 
-	if (channel->canManageCall()) {
+	if (peer->canManageGroupCall()) {
 		AddButton(
 			layout,
 			tr::lng_group_call_end(),
@@ -472,7 +491,7 @@ void GroupCallSettingsBox(
 		if (canChangeJoinMuted
 			&& muteJoined
 			&& muteJoined->toggled() != joinMuted) {
-			SaveCallJoinMuted(channel, id, muteJoined->toggled());
+			SaveCallJoinMuted(peer, id, muteJoined->toggled());
 		}
 	}, box->lifetime());
 	box->addButton(tr::lng_box_done(), [=] {

Telegram/SourceFiles/calls/calls_instance.cpp

@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_group_call.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_session.h"
 #include "media/audio/media_audio_track.h"
 #include "platform/platform_specific.h"
@@ -58,12 +59,12 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
 	}), video);
 }
 
-void Instance::startOrJoinGroupCall(not_null<ChannelData*> channel) {
+void Instance::startOrJoinGroupCall(not_null<PeerData*> peer) {
 	destroyCurrentCall();
 
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	createGroupCall(
-		channel,
+		peer,
 		call ? call->input() : MTP_inputGroupCall(MTPlong(), MTPlong()));
 }
 
@@ -97,35 +98,45 @@ void Instance::groupCallFailed(not_null<GroupCall*> call) {
 	});
 }
 
-void Instance::playSound(Sound sound) {
-	switch (sound) {
-	case Sound::Busy: {
-		if (!_callBusyTrack) {
-			_callBusyTrack = Media::Audio::Current().createTrack();
-			_callBusyTrack->fillFromFile(
-				Core::App().settings().getSoundPath(qsl("call_busy")));
-		}
-		_callBusyTrack->playOnce();
-	} break;
-
-	case Sound::Ended: {
-		if (!_callEndedTrack) {
-			_callEndedTrack = Media::Audio::Current().createTrack();
-			_callEndedTrack->fillFromFile(
-				Core::App().settings().getSoundPath(qsl("call_end")));
-		}
-		_callEndedTrack->playOnce();
-	} break;
-
-	case Sound::Connecting: {
-		if (!_callConnectingTrack) {
-			_callConnectingTrack = Media::Audio::Current().createTrack();
-			_callConnectingTrack->fillFromFile(
-				Core::App().settings().getSoundPath(qsl("call_connect")));
-		}
-		_callConnectingTrack->playOnce();
-	} break;
+not_null<Media::Audio::Track*> Instance::ensureSoundLoaded(
+		const QString &key) {
+	const auto i = _tracks.find(key);
+	if (i != end(_tracks)) {
+		return i->second.get();
 	}
+	const auto result = _tracks.emplace(
+		key,
+		Media::Audio::Current().createTrack()).first->second.get();
+	result->fillFromFile(Core::App().settings().getSoundPath(key));
+	return result;
+}
+
+void Instance::playSoundOnce(const QString &key) {
+	ensureSoundLoaded(key)->playOnce();
+}
+
+void Instance::callPlaySound(CallSound sound) {
+	playSoundOnce([&] {
+		switch (sound) {
+		case CallSound::Busy: return "call_busy";
+		case CallSound::Ended: return "call_end";
+		case CallSound::Connecting: return "call_connect";
+		}
+		Unexpected("CallSound in Instance::callPlaySound.");
+		return "";
+	}());
+}
+
+void Instance::groupCallPlaySound(GroupCallSound sound) {
+	playSoundOnce([&] {
+		switch (sound) {
+		case GroupCallSound::Started: return "group_call_start";
+		case GroupCallSound::Ended: return "group_call_end";
+		case GroupCallSound::Connecting: return "group_call_connect";
+		}
+		Unexpected("GroupCallSound in Instance::groupCallPlaySound.");
+		return "";
+	}());
 }
 
 void Instance::destroyCall(not_null<Call*> call) {
@@ -183,17 +194,17 @@ void Instance::destroyGroupCall(not_null<GroupCall*> call) {
 }
 
 void Instance::createGroupCall(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		const MTPInputGroupCall &inputCall) {
 	destroyCurrentCall();
 
 	auto call = std::make_unique<GroupCall>(
 		getGroupCallDelegate(),
-		channel,
+		peer,
 		inputCall);
 	const auto raw = call.get();
 
-	channel->session().account().sessionChanges(
+	peer->session().account().sessionChanges(
 	) | rpl::start_with_next([=] {
 		destroyGroupCall(raw);
 	}, raw->lifetime());
@@ -387,7 +398,7 @@ void Instance::handleGroupCallUpdate(
 		existing->applyUpdate(call);
 	}
 	if (_currentGroupCall
-		&& (&_currentGroupCall->channel()->session() == session)) {
+		&& (&_currentGroupCall->peer()->session() == session)) {
 		_currentGroupCall->handleUpdate(call);
 	}
 }
@@ -402,7 +413,7 @@ void Instance::handleGroupCallUpdate(
 		existing->applyUpdate(update);
 	}
 	if (_currentGroupCall
-		&& (&_currentGroupCall->channel()->session() == session)
+		&& (&_currentGroupCall->peer()->session() == session)
 		&& (_currentGroupCall->id() == callId)) {
 		_currentGroupCall->handleUpdate(update);
 	}
@@ -458,7 +469,7 @@ bool Instance::hasActivePanel(not_null<Main::Session*> session) const {
 		return (&_currentCall->user()->session() == session)
 			&& _currentCallPanel->isActive();
 	} else if (inGroupCall()) {
-		return (&_currentGroupCall->channel()->session() == session)
+		return (&_currentGroupCall->peer()->session() == session)
 			&& _currentGroupCallPanel->isActive();
 	}
 	return false;

Telegram/SourceFiles/calls/calls_instance.h

@@ -40,7 +40,7 @@ public:
 	~Instance();
 
 	void startOutgoingCall(not_null<UserData*> user, bool video);
-	void startOrJoinGroupCall(not_null<ChannelData*> channel);
+	void startOrJoinGroupCall(not_null<PeerData*> peer);
 	void handleUpdate(
 		not_null<Main::Session*> session,
 		const MTPUpdate &update);
@@ -64,6 +64,9 @@ public:
 	[[nodiscard]] bool isQuitPrevent();
 
 private:
+	using CallSound = Call::Delegate::CallSound;
+	using GroupCallSound = GroupCall::Delegate::GroupCallSound;
+
 	[[nodiscard]] not_null<Call::Delegate*> getCallDelegate() {
 		return static_cast<Call::Delegate*>(this);
 	}
@@ -73,6 +76,10 @@ private:
 	[[nodiscard]] DhConfig getDhConfig() const override {
 		return _dhConfig;
 	}
+
+	not_null<Media::Audio::Track*> ensureSoundLoaded(const QString &key);
+	void playSoundOnce(const QString &key);
+
 	void callFinished(not_null<Call*> call) override;
 	void callFailed(not_null<Call*> call) override;
 	void callRedial(not_null<Call*> call) override;
@@ -81,24 +88,26 @@ private:
 			bool video) override {
 		requestPermissionsOrFail(std::move(onSuccess), video);
 	}
+	void callPlaySound(CallSound sound) override;
 
 	void groupCallFinished(not_null<GroupCall*> call) override;
 	void groupCallFailed(not_null<GroupCall*> call) override;
 	void groupCallRequestPermissionsOrFail(Fn<void()> onSuccess) override {
 		requestPermissionsOrFail(std::move(onSuccess), false);
 	}
+	void groupCallPlaySound(GroupCallSound sound) override;
 
-	using Sound = Call::Delegate::Sound;
-	void playSound(Sound sound) override;
 	void createCall(not_null<UserData*> user, Call::Type type, bool video);
 	void destroyCall(not_null<Call*> call);
 
 	void createGroupCall(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		const MTPInputGroupCall &inputCall);
 	void destroyGroupCall(not_null<GroupCall*> call);
 
-	void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess);
+	void requestPermissionOrFail(
+		Platform::PermissionType type,
+		Fn<void()> onSuccess);
 
 	void refreshDhConfig();
 	void refreshServerConfig(not_null<Main::Session*> session);
@@ -132,9 +141,7 @@ private:
 	rpl::event_stream<GroupCall*> _currentGroupCallChanges;
 	std::unique_ptr<GroupPanel> _currentGroupCallPanel;
 
-	std::unique_ptr<Media::Audio::Track> _callConnectingTrack;
-	std::unique_ptr<Media::Audio::Track> _callEndedTrack;
-	std::unique_ptr<Media::Audio::Track> _callBusyTrack;
+	base::flat_map<QString, std::unique_ptr<Media::Audio::Track>> _tracks;
 
 };
 

Telegram/SourceFiles/calls/calls_panel.cpp

@@ -209,8 +209,14 @@ bool Panel::isActive() const {
 }
 
 void Panel::showAndActivate() {
+	if (_window->isHidden()) {
+		_window->show();
+	}
+	const auto state = _window->windowState();
+	if (state & Qt::WindowMinimized) {
+		_window->setWindowState(state & ~Qt::WindowMinimized);
+	}
 	_window->raise();
-	_window->setWindowState(_window->windowState() | Qt::WindowActive);
 	_window->activateWindow();
 	_window->setFocus();
 }

Telegram/SourceFiles/calls/calls_top_bar.cpp

@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/text/format_values.h"
+#include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
 #include "core/application.h"
 #include "calls/calls_call.h"
@@ -24,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_group_call_tracker.h" // ContentByCall.
 #include "data/data_user.h"
 #include "data/data_group_call.h"
-#include "data/data_channel.h"
+#include "data/data_peer.h"
 #include "data/data_changes.h"
 #include "main/main_session.h"
 #include "boxes/abstract_box.h"
@@ -34,63 +35,87 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 
 namespace Calls {
+
+enum class BarState {
+	Connecting,
+	Active,
+	Muted,
+	ForceMuted,
+};
+
 namespace {
 
+constexpr auto kMaxUsersInBar = 3;
 constexpr auto kUpdateDebugTimeoutMs = crl::time(500);
 constexpr auto kSwitchStateDuration = 120;
 
 constexpr auto kMinorBlobAlpha = 76. / 255.;
 
-constexpr auto kBlobLevelDuration1 = 250;
-constexpr auto kBlobLevelDuration2 = 120;
+constexpr auto kHideBlobsDuration = crl::time(500);
+constexpr auto kBlobLevelDuration = crl::time(250);
 constexpr auto kBlobUpdateInterval = crl::time(100);
 
-auto LinearBlobs() -> std::array<Ui::Paint::LinearBlobs::BlobData, 3> {
-	return { {
+auto BarStateFromMuteState(MuteState state, bool connecting) {
+	return (connecting
+		? BarState::Connecting
+		: state == MuteState::ForceMuted
+		? BarState::ForceMuted
+		: state == MuteState::Muted
+		? BarState::Muted
+		: BarState::Active);
+};
+
+auto LinearBlobs() {
+	return std::vector<Ui::Paint::LinearBlobs::BlobData>{
 		{
 			.segmentsCount = 5,
-			.minScale = 1.,
-			.minRadius = (float)st::groupCallMajorBlobMinRadius,
+			.minRadius = 0.,
 			.maxRadius = (float)st::groupCallMajorBlobMaxRadius,
+			.idleRadius = (float)st::groupCallMinorBlobIdleRadius,
 			.speedScale = .3,
 			.alpha = 1.,
-			.topOffset = st::groupCallMajorBlobTopOffset,
 		},
 		{
 			.segmentsCount = 7,
-			.minScale = 1.,
-			.minRadius = (float)st::groupCallMinorBlobMinRadius,
+			.minRadius = 0.,
 			.maxRadius = (float)st::groupCallMinorBlobMaxRadius,
+			.idleRadius = (float)st::groupCallMinorBlobIdleRadius,
 			.speedScale = .7,
 			.alpha = kMinorBlobAlpha,
-			.topOffset = st::groupCallMinorBlobTopOffset,
 		},
 		{
 			.segmentsCount = 8,
-			.minScale = 1.,
-			.minRadius = (float)st::groupCallMinorBlobMinRadius,
+			.minRadius = 0.,
 			.maxRadius = (float)st::groupCallMinorBlobMaxRadius,
+			.idleRadius = (float)st::groupCallMinorBlobIdleRadius,
 			.speedScale = .7,
 			.alpha = kMinorBlobAlpha,
-			.topOffset = st::groupCallMinorBlobTopOffset,
 		},
-	} };
+	};
 }
 
 auto Colors() {
 	using Vector = std::vector<QColor>;
-	return base::flat_map<MuteState, Vector>{
+	using Colors = anim::gradient_colors;
+	return base::flat_map<BarState, Colors>{
 		{
-			MuteState::ForceMuted,
-			Vector{ st::groupCallMembersBg->c, st::groupCallMembersBg->c }
+			BarState::ForceMuted,
+			Colors(QGradientStops{
+				{ 0.0, st::groupCallForceMutedBar1->c },
+				{ .35, st::groupCallForceMutedBar2->c },
+				{ 1.0, st::groupCallForceMutedBar3->c } })
 		},
 		{
-			MuteState::Active,
-			Vector{ st::groupCallLive1->c, st::groupCallLive2->c }
+			BarState::Active,
+			Colors(Vector{ st::groupCallLive1->c, st::groupCallLive2->c })
 		},
 		{
-			MuteState::Muted,
-			Vector{ st::groupCallMuted1->c, st::groupCallMuted2->c }
+			BarState::Muted,
+			Colors(Vector{ st::groupCallMuted1->c, st::groupCallMuted2->c })
+		},
+		{
+			BarState::Connecting,
+			Colors(st::callBarBgMuted->c)
 		},
 	};
 }
@@ -139,6 +164,10 @@ void DebugInfoBox::updateText() {
 
 } // namespace
 
+struct TopBar::User {
+	Ui::GroupCallBarContent::User data;
+};
+
 class Mute final : public Ui::IconButton {
 public:
 	Mute(QWidget *parent, const style::IconButton &st)
@@ -237,7 +266,9 @@ void TopBar::initControls() {
 		if (const auto call = _call.get()) {
 			call->setMuted(!call->muted());
 		} else if (const auto group = _groupCall.get()) {
-			if (group->muted() != MuteState::ForceMuted) {
+			if (group->muted() == MuteState::ForceMuted) {
+				Ui::Toast::Show(tr::lng_group_call_force_muted(tr::now));
+			} else {
 				group->setMuted((group->muted() == MuteState::Muted)
 					? MuteState::Active
 					: MuteState::Muted);
@@ -248,27 +279,36 @@ void TopBar::initControls() {
 	const auto mapToState = [](bool muted) {
 		return muted ? MuteState::Muted : MuteState::Active;
 	};
-	const auto fromState = _mute->lifetime().make_state<MuteState>(
-		_call ? mapToState(_call->muted()) : _groupCall->muted());
+	const auto fromState = _mute->lifetime().make_state<BarState>(
+		BarStateFromMuteState(
+			_call
+				? mapToState(_call->muted())
+				: _groupCall->muted(),
+			false));
 	auto muted = _call
-		? _call->mutedValue() | rpl::map(mapToState)
-		: (_groupCall->mutedValue()
-			| MapPushToTalkToActive()
-			| rpl::distinct_until_changed()
-			| rpl::type_erased());
+		? rpl::combine(
+			_call->mutedValue() | rpl::map(mapToState),
+			rpl::single(false)) | rpl::type_erased()
+		: rpl::combine(
+			(_groupCall->mutedValue()
+				| MapPushToTalkToActive()
+				| rpl::distinct_until_changed()
+				| rpl::type_erased()),
+			_groupCall->connectingValue());
 	std::move(
 		muted
-	) | rpl::start_with_next([=](MuteState state) {
-		setMuted(state != MuteState::Active);
+	) | rpl::map(
+		BarStateFromMuteState
+	) | rpl::start_with_next([=](BarState state) {
+		_isGroupConnecting = (state == BarState::Connecting);
+		setMuted(state != BarState::Active);
 		update();
 
-		const auto isForceMuted = (state == MuteState::ForceMuted);
+		const auto isForceMuted = (state == BarState::ForceMuted);
 		if (isForceMuted) {
 			_mute->clearState();
 		}
-		_mute->setAttribute(
-			Qt::WA_TransparentForMouseEvents,
-			isForceMuted);
+		_mute->setPointerCursor(!isForceMuted);
 
 		const auto to = 1.;
 		const auto from = _switchStateAnimation.animating()
@@ -278,8 +318,8 @@ void TopBar::initControls() {
 		const auto toMuted = state;
 		*fromState = state;
 
-		const auto crossFrom = (fromMuted != MuteState::Active) ? 1. : 0.;
-		const auto crossTo = (toMuted != MuteState::Active) ? 1. : 0.;
+		const auto crossFrom = (fromMuted != BarState::Active) ? 1. : 0.;
+		const auto crossTo = (toMuted != BarState::Active) ? 1. : 0.;
 
 		auto animationCallback = [=](float64 value) {
 			if (_groupCall) {
@@ -290,7 +330,7 @@ void TopBar::initControls() {
 
 			const auto crossProgress = (crossFrom == crossTo)
 				? crossTo
-				: (crossFrom + float64(crossTo - crossFrom) * value);
+				: anim::interpolateF(crossFrom, crossTo, value);
 			_mute->setProgress(crossProgress);
 		};
 
@@ -305,6 +345,14 @@ void TopBar::initControls() {
 
 	if (const auto group = _groupCall.get()) {
 		subscribeToMembersChanges(group);
+
+		_isGroupConnecting.value(
+		) | rpl::start_with_next([=](bool isConnecting) {
+			_mute->setAttribute(
+				Qt::WA_TransparentForMouseEvents,
+				isConnecting);
+			updateInfoLabels();
+		}, lifetime());
 	}
 
 	if (const auto call = _call.get()) {
@@ -335,11 +383,15 @@ void TopBar::initControls() {
 		if (const auto call = _call.get()) {
 			call->hangup();
 		} else if (const auto group = _groupCall.get()) {
-			Ui::show(Box(
-				LeaveGroupCallBox,
-				group,
-				false,
-				BoxContext::MainWindow));
+			if (!group->peer()->canManageGroupCall()) {
+				group->hangup();
+			} else {
+				Ui::show(Box(
+					LeaveGroupCallBox,
+					group,
+					false,
+					BoxContext::MainWindow));
+			}
 		}
 	});
 	updateDurationText();
@@ -353,14 +405,12 @@ void TopBar::initBlobsUnder(
 		return;
 	}
 
-	static constexpr auto kHideDuration = kBlobLevelDuration1 * 2;
-
 	struct State {
 		Ui::Paint::LinearBlobs paint = {
-			LinearBlobs() | ranges::to_vector,
-			kBlobLevelDuration1,
-			kBlobLevelDuration2,
-			1.
+			LinearBlobs(),
+			kBlobLevelDuration,
+			1.,
+			Ui::Paint::LinearBlob::Direction::TopDown
 		};
 		Ui::Animations::Simple hideAnimation;
 		Ui::Animations::Basic animation;
@@ -369,8 +419,6 @@ void TopBar::initBlobsUnder(
 		crl::time lastTime = 0;
 		float lastLevel = 0.;
 		float levelBeforeLast = 0.;
-		int maxHeight = st::groupCallMinorBlobMinRadius
-			+ st::groupCallMinorBlobMaxRadius;
 	};
 
 	_blobs = base::make_unique_q<Ui::RpWidget>(blobsParent);
@@ -387,7 +435,7 @@ void TopBar::initBlobsUnder(
 
 	state->animation.init([=](crl::time now) {
 		if (const auto last = state->hideLastTime; (last > 0)
-			&& (now - last >= kHideDuration)) {
+			&& (now - last >= kHideBlobsDuration)) {
 			state->animation.stop();
 			return false;
 		}
@@ -408,23 +456,14 @@ void TopBar::initBlobsUnder(
 	auto hideBlobs = rpl::combine(
 		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
 		Core::App().appDeactivatedValue(),
-		group->stateValue(
-		) | rpl::map([](Calls::GroupCall::State state) {
-			using State = Calls::GroupCall::State;
-			if (state != State::Creating
-				&& state != State::Joining
-				&& state != State::Joined
-				&& state != State::Connecting) {
-				return true;
-			}
-			return false;
-		}) | rpl::distinct_until_changed()
-	) | rpl::map([](bool animDisabled, bool hide, bool isBadState) {
-		return isBadState || animDisabled || hide;
+		group->connectingValue()
+	) | rpl::map([](bool animDisabled, bool hide, bool connecting) {
+		return connecting || animDisabled || hide;
 	});
 
 	std::move(
 		hideBlobs
+	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool hide) {
 		if (hide) {
 			state->paint.setLevel(0.);
@@ -443,7 +482,7 @@ void TopBar::initBlobsUnder(
 		const auto to = hide ? 1. : 0.;
 		state->hideAnimation.start([=](float64) {
 			_blobs->update();
-		}, from, to, kHideDuration);
+		}, from, to, kHideBlobsDuration);
 	}, lifetime());
 
 	std::move(
@@ -451,7 +490,7 @@ void TopBar::initBlobsUnder(
 	) | rpl::start_with_next([=](QRect rect) {
 		_blobs->resize(
 			rect.width(),
-			std::min(state->maxHeight, rect.height()));
+			(int)state->paint.maxRadius());
 		_blobs->moveToLeft(rect.x(), rect.y() + rect.height());
 	}, lifetime());
 
@@ -473,12 +512,9 @@ void TopBar::initBlobsUnder(
 			p.setOpacity(1. - hidden);
 		}
 		const auto top = -_blobs->height() * hidden;
-		const auto drawUnder = QRect(
-			0,
-			top,
-			_blobs->width() + st::groupCallBlobWidthAdditional,
-			0);
-		state->paint.paint(p, _groupBrush, drawUnder, 0, 0);
+		const auto width = _blobs->width();
+		p.translate(0, top);
+		state->paint.paint(p, _groupBrush, width);
 	}, _blobs->lifetime());
 
 	group->levelUpdates(
@@ -501,12 +537,12 @@ void TopBar::initBlobsUnder(
 }
 
 void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
-	const auto channel = call->channel();
-	channel->session().changes().peerFlagsValue(
-		channel,
+	const auto peer = call->peer();
+	peer->session().changes().peerFlagsValue(
+		peer,
 		Data::PeerUpdate::Flag::GroupCall
 	) | rpl::map([=] {
-		return channel->call();
+		return peer->groupCall();
 	}) | rpl::filter([=](Data::GroupCall *real) {
 		const auto call = _groupCall.get();
 		return call && real && (real->id() == call->id());
@@ -521,14 +557,75 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 				.stroke = st::groupCallTopBarUserpicStroke,
 			});
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
-		const auto changed = (_userpics.size() != content.userpics.size());
-		_userpics = content.userpics;
-		if (changed) {
+	) | rpl::filter([=](const Ui::GroupCallBarContent &content) {
+		if (_users.size() != content.users.size()) {
+			return true;
+		}
+		for (auto i = 0, count = int(_users.size()); i != count; ++i) {
+			if (_users[i].data.userpicKey != content.users[i].userpicKey
+				|| _users[i].data.id != content.users[i].id) {
+				return true;
+			}
+		}
+		return false;
+	}) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
+		const auto sizeChanged = (_users.size() != content.users.size());
+		_users = ranges::view::all(
+			content.users
+		) | ranges::view::transform([](const auto &user) {
+			return User{ user };
+		}) | ranges::to_vector;
+		generateUserpicsInRow();
+		if (sizeChanged) {
 			updateControlsGeometry();
 		}
 		update();
 	}, lifetime());
+
+	call->peer()->session().changes().peerUpdates(
+		Data::PeerUpdate::Flag::Name
+	) | rpl::filter([=](const Data::PeerUpdate &update) {
+		// _peer may change for the same Panel.
+		const auto call = _groupCall.get();
+		return (call != nullptr) && (update.peer == call->peer());
+	}) | rpl::start_with_next([=] {
+		updateInfoLabels();
+	}, lifetime());
+
+}
+
+void TopBar::generateUserpicsInRow() {
+	const auto count = int(_users.size());
+	if (!count) {
+		_userpics = QImage();
+		return;
+	}
+	const auto limit = std::min(count, kMaxUsersInBar);
+	const auto single = st::groupCallTopBarUserpicSize;
+	const auto shift = st::groupCallTopBarUserpicShift;
+	const auto width = single + (limit - 1) * (single - shift);
+	if (_userpics.width() != width * cIntRetinaFactor()) {
+		_userpics = QImage(
+			QSize(width, single) * cIntRetinaFactor(),
+			QImage::Format_ARGB32_Premultiplied);
+	}
+	_userpics.fill(Qt::transparent);
+	_userpics.setDevicePixelRatio(cRetinaFactor());
+
+	auto q = Painter(&_userpics);
+	auto hq = PainterHighQualityEnabler(q);
+	auto pen = QPen(Qt::transparent);
+	pen.setWidth(st::groupCallTopBarUserpicStroke);
+	auto x = (count - 1) * (single - shift);
+	for (auto i = count; i != 0;) {
+		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		q.drawImage(x, 0, _users[--i].data.userpic);
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		q.setBrush(Qt::NoBrush);
+		q.setPen(pen);
+		q.drawEllipse(x, 0, single, single);
+		x -= single - shift;
+	}
 }
 
 void TopBar::updateInfoLabels() {
@@ -544,10 +641,13 @@ void TopBar::setInfoLabels() {
 		_fullInfoLabel->setText(fullName.toUpper());
 		_shortInfoLabel->setText(shortName.toUpper());
 	} else if (const auto group = _groupCall.get()) {
-		const auto channel = group->channel();
-		const auto name = channel->name;
-		_fullInfoLabel->setText(name.toUpper());
-		_shortInfoLabel->setText(name.toUpper());
+		const auto peer = group->peer();
+		const auto name = peer->name;
+		const auto text = _isGroupConnecting.current()
+			? tr::lng_group_call_connecting(tr::now)
+			: name.toUpper();
+		_fullInfoLabel->setText(text);
+		_shortInfoLabel->setText(text);
 	}
 }
 

Telegram/SourceFiles/calls/calls_top_bar.h

@@ -33,6 +33,7 @@ class GroupCall;
 class SignalBars;
 class Mute;
 enum class MuteState;
+enum class BarState;
 
 class TopBar : public Ui::RpWidget {
 public:
@@ -49,6 +50,8 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
+	struct User;
+
 	TopBar(
 		QWidget *parent,
 		const base::weak_ptr<Call> &call,
@@ -63,11 +66,13 @@ private:
 	void setMuted(bool mute);
 
 	void subscribeToMembersChanges(not_null<GroupCall*> call);
+	void generateUserpicsInRow();
 
 	const base::weak_ptr<Call> _call;
 	const base::weak_ptr<GroupCall> _groupCall;
 
 	bool _muted = false;
+	std::vector<User> _users;
 	QImage _userpics;
 	object_ptr<Ui::LabelSimple> _durationLabel;
 	object_ptr<SignalBars> _signalBars;
@@ -79,8 +84,10 @@ private:
 	object_ptr<Ui::IconButton> _hangup;
 	base::unique_qptr<Ui::RpWidget> _blobs;
 
+	rpl::variable<bool> _isGroupConnecting = false;
+
 	QBrush _groupBrush;
-	anim::linear_gradients<MuteState> _gradients;
+	anim::linear_gradients<BarState> _gradients;
 	Ui::Animations::Simple _switchStateAnimation;
 
 	base::Timer _updateDurationTimer;

Telegram/SourceFiles/core/application.cpp

@@ -789,9 +789,17 @@ bool Application::openCustomUrl(
 
 }
 
+void Application::preventOrInvoke(Fn<void()> &&callback) {
+	_window->preventOrInvoke(std::move(callback));
+}
+
 void Application::lockByPasscode() {
-	_passcodeLock = true;
-	_window->setupPasscodeLock();
+	preventOrInvoke([=] {
+		if (_window) {
+			_passcodeLock = true;
+			_window->setupPasscodeLock();
+		}
+	});
 }
 
 void Application::unlockPasscode() {

Telegram/SourceFiles/core/application.h

@@ -277,6 +277,8 @@ public:
 	void switchFreeType();
 	void writeInstallBetaVersionsSetting();
 
+	void preventOrInvoke(Fn<void()> &&callback);
+
 	void call_handleObservables();
 
 protected:

Telegram/SourceFiles/core/changelogs.cpp

@@ -21,60 +21,6 @@ namespace {
 
 std::map<int, const char*> BetaLogs() {
 	return {
-	{
-		2001008,
-		"- Add support for full group message history export.\n"
-
-		"- Allow export of a single chat message history in JSON format."
-	},
-	{
-		2001014,
-		"- Support for multiple accounts."
-	},
-	{
-		2001017,
-		"- Fix messages editing in a non-active account.\n"
-
-		"- Fix large animated emoji messages editing.\n"
-
-		"- Fix high definition GIF animations opening in media viewer.\n"
-
-		"- Multiple crash fixes."
-	},
-	{
-		2001018,
-		"- Fix a possible crash in Picture-in-Picture video player.\n"
-
-		"- Fix copying links from message texts.\n"
-
-		"- Raise file size limit to 2000 MB.\n"
-
-		"- Allow using system window frame in Windows and Linux."
-	},
-	{
-		2001019,
-		"- File uploading in an inactive account correctly finishes.\n"
-
-		"- Stickers panel works correctly after switching between accounts.\n"
-
-		"- Large .webp files are not shown as stickers.\n"
-
-		"- MacBook TouchBar support was fully rewritten with fixes for multiple accounts.\n"
-
-		"- Custom window title bar works in all Linux versions.\n"
-
-		"- Passcode doesn't auto-lock while you're active in other apps on Linux X11."
-	},
-	{
-		2001021,
-		"- Edit your scheduled messages.\n"
-
-		"- See the unread messages indicator for your additional accounts on the main menu button.\n"
-
-		"- Use Auto-Night Mode to make Telegram night mode match the system Dark Mode settings.\n"
-
-		"- Enjoy dark native window frame for Telegram night mode on Windows.\n"
-	},
 	{
 		2004006,
 		"- Fix image compression option when sending files with drag-n-drop.\n"
@@ -109,6 +55,26 @@ std::map<int, const char*> BetaLogs() {
 		2004012,
 		"- Voice chats in groups. (alpha version)\n"
 	},
+	{
+		2004014,
+		"- Create voice chats in legacy groups.\n"
+
+		"- Fix sticker pack opening.\n"
+
+		"- Fix group status display.\n"
+		
+		"- Fix group members display.\n"
+	},
+	{
+		2004015,
+		"- Improve design of voice chats.\n"
+
+		"- Fix sending of voice messages as replies.\n"
+
+		"- Fix 'Open With' menu position in macOS.\n"
+
+		"- Fix freeze on secondary screen disconnect.\n"
+	},
 	};
 };
 

Telegram/SourceFiles/core/update_checker.cpp

@@ -1591,7 +1591,7 @@ void UpdateApplication() {
 		if (const auto window = App::wnd()) {
 			if (const auto controller = window->sessionController()) {
 				controller->showSection(
-					Info::Memento(
+					std::make_shared<Info::Memento>(
 						Info::Settings::Tag{ controller->session().user() },
 						Info::Section::SettingsType::Advanced),
 					Window::SectionShow());

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 = 2004013;
-constexpr auto AppVersionStr = "2.4.13";
+constexpr auto AppVersion = 2004015;
+constexpr auto AppVersionStr = "2.4.15";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

Telegram/SourceFiles/data/data_channel.cpp

@@ -104,13 +104,9 @@ void ChannelData::setInviteLink(const QString &newInviteLink) {
 	}
 }
 
-QString ChannelData::inviteLink() const {
-	return _inviteLink;
-}
-
 bool ChannelData::canHaveInviteLink() const {
-	return (adminRights() & AdminRight::f_invite_users)
-		|| amCreator();
+	return amCreator()
+		|| (adminRights() & AdminRight::f_invite_users);
 }
 
 void ChannelData::setLocation(const MTPChannelLocation &data) {
@@ -524,10 +520,6 @@ bool ChannelData::canRestrictUser(not_null<UserData*> user) const {
 	return adminRights() & AdminRight::f_ban_users;
 }
 
-bool ChannelData::canManageCall() const {
-	return amCreator() || (adminRights() & AdminRight::f_manage_call);
-}
-
 void ChannelData::setAdminRights(const MTPChatAdminRights &rights) {
 	if (rights.c_chatAdminRights().vflags().v == adminRights()) {
 		return;
@@ -677,14 +669,24 @@ void ChannelData::privateErrorReceived() {
 	}
 }
 
-void ChannelData::setCall(const MTPInputGroupCall &call) {
+void ChannelData::migrateCall(std::unique_ptr<Data::GroupCall> call) {
+	Expects(_call == nullptr);
+	Expects(call != nullptr);
+
+	_call = std::move(call);
+	_call->setPeer(this);
+	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+	addFlags(MTPDchannel::Flag::f_call_active);
+}
+
+void ChannelData::setGroupCall(const MTPInputGroupCall &call) {
 	call.match([&](const MTPDinputGroupCall &data) {
 		if (_call && _call->id() == data.vid().v) {
 			return;
 		} else if (!_call && !data.vid().v) {
 			return;
 		} else if (!data.vid().v) {
-			clearCall();
+			clearGroupCall();
 			return;
 		}
 		const auto hasCall = (_call != nullptr);
@@ -701,7 +703,7 @@ void ChannelData::setCall(const MTPInputGroupCall &call) {
 	});
 }
 
-void ChannelData::clearCall() {
+void ChannelData::clearGroupCall() {
 	if (!_call) {
 		return;
 	}
@@ -744,9 +746,9 @@ void ApplyChannelUpdate(
 	auto canEditStickers = channel->canEditStickers();
 
 	if (const auto call = update.vcall()) {
-		channel->setCall(*call);
+		channel->setGroupCall(*call);
 	} else {
-		channel->clearCall();
+		channel->clearGroupCall();
 	}
 
 	channel->setFullFlags(update.vflags().v);

Telegram/SourceFiles/data/data_channel.h

@@ -11,10 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_pts_waiter.h"
 #include "data/data_location.h"
 
-namespace Data {
-class GroupCall;
-} // namespace Data
-
 struct ChannelLocation {
 	QString address;
 	Data::LocationPoint point;
@@ -307,10 +303,11 @@ public:
 	[[nodiscard]] bool canDelete() const;
 	[[nodiscard]] bool canEditAdmin(not_null<UserData*> user) const;
 	[[nodiscard]] bool canRestrictUser(not_null<UserData*> user) const;
-	[[nodiscard]] bool canManageCall() const;
 
 	void setInviteLink(const QString &newInviteLink);
-	[[nodiscard]] QString inviteLink() const;
+	[[nodiscard]] QString inviteLink() const {
+		return _inviteLink;
+	}
 	[[nodiscard]] bool canHaveInviteLink() const;
 
 	void setLocation(const MTPChannelLocation &data);
@@ -399,11 +396,12 @@ public:
 	[[nodiscard]] QString invitePeekHash() const;
 	void privateErrorReceived();
 
-	[[nodiscard]] Data::GroupCall *call() const {
+	[[nodiscard]] Data::GroupCall *groupCall() const {
 		return _call.get();
 	}
-	void setCall(const MTPInputGroupCall &call);
-	void clearCall();
+	void migrateCall(std::unique_ptr<Data::GroupCall> call);
+	void setGroupCall(const MTPInputGroupCall &call);
+	void clearGroupCall();
 
 	// Still public data members.
 	uint64 access = 0;

Telegram/SourceFiles/data/data_chat.cpp

@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
+#include "data/data_group_call.h"
 #include "history/history.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
@@ -24,6 +25,14 @@ using UpdateFlag = Data::PeerUpdate::Flag;
 ChatData::ChatData(not_null<Data::Session*> owner, PeerId id)
 : PeerData(owner, id)
 , inputChat(MTP_int(bareId())) {
+	_flags.changes(
+	) | rpl::start_with_next([=](const Flags::Change &change) {
+		if (change.diff & MTPDchat::Flag::f_call_not_empty) {
+			if (const auto history = this->owner().historyLoaded(this)) {
+				history->updateChatListEntry();
+			}
+		}
+	}, _lifetime);
 }
 
 void ChatData::setPhoto(const MTPChatPhoto &photo) {
@@ -124,6 +133,11 @@ void ChatData::setInviteLink(const QString &newInviteLink) {
 	}
 }
 
+bool ChatData::canHaveInviteLink() const {
+	return amCreator()
+		|| (adminRights() & AdminRight::f_invite_users);
+}
+
 void ChatData::setAdminRights(const MTPChatAdminRights &rights) {
 	if (rights.c_chatAdminRights().vflags().v == adminRights()) {
 		return;
@@ -176,6 +190,47 @@ void ChatData::setMigrateToChannel(ChannelData *channel) {
 	}
 }
 
+void ChatData::setGroupCall(const MTPInputGroupCall &call) {
+	if (migrateTo()) {
+		return;
+	}
+	call.match([&](const MTPDinputGroupCall &data) {
+		if (_call && _call->id() == data.vid().v) {
+			return;
+		} else if (!_call && !data.vid().v) {
+			return;
+		} else if (!data.vid().v) {
+			clearGroupCall();
+			return;
+		}
+		const auto hasCall = (_call != nullptr);
+		if (hasCall) {
+			owner().unregisterGroupCall(_call.get());
+		}
+		_call = std::make_unique<Data::GroupCall>(
+			this,
+			data.vid().v,
+			data.vaccess_hash().v);
+		owner().registerGroupCall(_call.get());
+		session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+		addFlags(MTPDchat::Flag::f_call_active);
+	});
+}
+
+void ChatData::clearGroupCall() {
+	if (!_call) {
+		return;
+	} else if (const auto group = migrateTo(); group && !group->groupCall()) {
+		group->migrateCall(base::take(_call));
+	} else {
+		owner().unregisterGroupCall(_call.get());
+		_call = nullptr;
+	}
+	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+	removeFlags(MTPDchat::Flag::f_call_active
+		| MTPDchat::Flag::f_call_not_empty);
+}
+
 namespace Data {
 
 void ApplyChatUpdate(
@@ -310,6 +365,12 @@ void ApplyChatUpdate(
 void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
 	ApplyChatUpdate(chat, update.vparticipants());
 
+	if (const auto call = update.vcall()) {
+		chat->setGroupCall(*call);
+	} else {
+		chat->clearGroupCall();
+	}
+
 	if (const auto info = update.vbot_info()) {
 		for (const auto &item : info->v) {
 			item.match([&](const MTPDbotInfo &data) {

Telegram/SourceFiles/data/data_chat.h

@@ -18,6 +18,7 @@ public:
 		| MTPDchat::Flag::f_deactivated
 		| MTPDchat::Flag::f_migrated_to
 		| MTPDchat::Flag::f_admin_rights
+		| MTPDchat::Flag::f_call_not_empty
 		| MTPDchat::Flag::f_default_banned_rights;
 	using Flags = Data::Flags<
 		MTPDchat::Flags,
@@ -141,9 +142,10 @@ public:
 	void applyEditAdmin(not_null<UserData*> user, bool isAdmin);
 
 	void setInviteLink(const QString &newInviteLink);
-	QString inviteLink() const {
+	[[nodiscard]] QString inviteLink() const {
 		return _inviteLink;
 	}
+	[[nodiscard]] bool canHaveInviteLink() const;
 	void refreshBotStatus();
 
 	enum class UpdateStatus {
@@ -162,6 +164,12 @@ public:
 	ChannelData *getMigrateToChannel() const;
 	void setMigrateToChannel(ChannelData *channel);
 
+	[[nodiscard]] Data::GroupCall *groupCall() const {
+		return _call.get();
+	}
+	void setGroupCall(const MTPInputGroupCall &call);
+	void clearGroupCall();
+
 	// Still public data members.
 	const MTPint inputChat;
 
@@ -185,7 +193,10 @@ private:
 	AdminRightFlags _adminRights;
 	int _version = 0;
 
+	std::unique_ptr<Data::GroupCall> _call;
+
 	ChannelData *_migratedTo = nullptr;
+	rpl::lifetime _lifetime;
 
 };
 

Telegram/SourceFiles/data/data_group_call.cpp

@@ -7,30 +7,38 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_group_call.h"
 
+#include "base/unixtime.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
+#include "calls/calls_instance.h"
+#include "calls/calls_group_call.h"
+#include "core/application.h"
 #include "apiwrap.h"
 
 namespace Data {
 namespace {
 
 constexpr auto kRequestPerPage = 30;
+constexpr auto kSpeakingAfterActive = crl::time(6000);
+constexpr auto kActiveAfterJoined = crl::time(1000);
 
 } // namespace
 
 GroupCall::GroupCall(
-	not_null<ChannelData*> channel,
+	not_null<PeerData*> peer,
 	uint64 id,
 	uint64 accessHash)
-: _channel(channel)
-, _id(id)
-, _accessHash(accessHash) {
+: _id(id)
+, _accessHash(accessHash)
+, _peer(peer) // #TODO calls migration
+, _speakingByActiveFinishTimer([=] { checkFinishSpeakingByActive(); }) {
 }
 
 GroupCall::~GroupCall() {
-	api().request(_unknownSsrcsRequestId).cancel();
+	api().request(_unknownUsersRequestId).cancel();
 	api().request(_participantsRequestId).cancel();
 	api().request(_reloadRequestId).cancel();
 }
@@ -39,14 +47,21 @@ uint64 GroupCall::id() const {
 	return _id;
 }
 
-not_null<ChannelData*> GroupCall::channel() const {
-	return _channel;
+not_null<PeerData*> GroupCall::peer() const {
+	return _peer;
 }
 
 MTPInputGroupCall GroupCall::input() const {
 	return MTP_inputGroupCall(MTP_long(_id), MTP_long(_accessHash));
 }
 
+void GroupCall::setPeer(not_null<PeerData*> peer) {
+	Expects(peer->migrateFrom() == _peer);
+	Expects(_peer->migrateTo() == peer);
+
+	_peer = peer;
+}
+
 auto GroupCall::participants() const
 -> const std::vector<Participant> & {
 	return _participants;
@@ -70,7 +85,7 @@ void GroupCall::requestParticipants() {
 	)).done([=](const MTPphone_GroupParticipants &result) {
 		result.match([&](const MTPDphone_groupParticipants &data) {
 			_nextOffset = qs(data.vnext_offset());
-			_channel->owner().processUsers(data.vusers());
+			_peer->owner().processUsers(data.vusers());
 			applyParticipantsSlice(
 				data.vparticipants().v,
 				ApplySliceSource::SliceLoaded);
@@ -85,30 +100,43 @@ void GroupCall::requestParticipants() {
 		});
 		_participantsSliceAdded.fire({});
 		_participantsRequestId = 0;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}).fail([=](const RPCError &error) {
 		_fullCount = _participants.size();
 		_allReceived = true;
 		_participantsRequestId = 0;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}).send();
 }
 
-void GroupCall::changeChannelEmptyCallFlag() {
-	constexpr auto flag = MTPDchannel::Flag::f_call_not_empty;
-	if (_channel->call() != this) {
+void GroupCall::changePeerEmptyCallFlag() {
+	const auto chat = _peer->asChat();
+	const auto channel = _peer->asChannel();
+	constexpr auto chatFlag = MTPDchat::Flag::f_call_not_empty;
+	constexpr auto channelFlag = MTPDchannel::Flag::f_call_not_empty;
+	if (_peer->groupCall() != this) {
 		return;
 	} else if (fullCount() > 0) {
-		if (!(_channel->flags() & flag)) {
-			_channel->addFlags(flag);
-			_channel->session().changes().peerUpdated(
-				_channel,
+		if (chat && !(chat->flags() & chatFlag)) {
+			chat->addFlags(chatFlag);
+			chat->session().changes().peerUpdated(
+				chat,
+				Data::PeerUpdate::Flag::GroupCall);
+		} else if (channel && !(channel->flags() & channelFlag)) {
+			channel->addFlags(channelFlag);
+			channel->session().changes().peerUpdated(
+				channel,
 				Data::PeerUpdate::Flag::GroupCall);
 		}
-	} else if (_channel->flags() & flag) {
-		_channel->removeFlags(flag);
-		_channel->session().changes().peerUpdated(
-			_channel,
+	} else if (chat && (chat->flags() & chatFlag)) {
+		chat->removeFlags(chatFlag);
+		chat->session().changes().peerUpdated(
+			chat,
+			Data::PeerUpdate::Flag::GroupCall);
+	} else if (channel && (channel->flags() & channelFlag)) {
+		channel->removeFlags(channelFlag);
+		channel->session().changes().peerUpdated(
+			channel,
 			Data::PeerUpdate::Flag::GroupCall);
 	}
 }
@@ -159,13 +187,17 @@ void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
 		_canChangeJoinMuted = data.is_can_change_join_muted();
 		_version = data.vversion().v;
 		_fullCount = data.vparticipants_count().v;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}, [&](const MTPDgroupCallDiscarded &data) {
 		const auto id = _id;
-		const auto channel = _channel;
-		crl::on_main(&channel->session(), [=] {
-			if (channel->call() && channel->call()->id() == id) {
-				channel->clearCall();
+		const auto peer = _peer;
+		crl::on_main(&peer->session(), [=] {
+			if (peer->groupCall() && peer->groupCall()->id() == id) {
+				if (const auto chat = peer->asChat()) {
+					chat->clearGroupCall();
+				} else if (const auto channel = peer->asChannel()) {
+					channel->clearGroupCall();
+				}
 			}
 		});
 	});
@@ -182,8 +214,9 @@ void GroupCall::reload() {
 		MTPphone_GetGroupCall(input())
 	).done([=](const MTPphone_GroupCall &result) {
 		result.match([&](const MTPDphone_groupCall &data) {
-			_channel->owner().processUsers(data.vusers());
+			_peer->owner().processUsers(data.vusers());
 			_participants.clear();
+			_speakingByActiveFinishes.clear();
 			_userBySsrc.clear();
 			applyParticipantsSlice(
 				data.vparticipants().v,
@@ -201,11 +234,15 @@ void GroupCall::reload() {
 void GroupCall::applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
 		ApplySliceSource sliceSource) {
+	const auto amInCall = inCall();
+	const auto now = base::unixtime::now();
+	const auto speakingAfterActive = TimeId(kSpeakingAfterActive / 1000);
+
 	auto changedCount = _fullCount.current();
 	for (const auto &participant : list) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
 			const auto userId = data.vuser_id().v;
-			const auto user = _channel->owner().user(userId);
+			const auto user = _peer->owner().user(userId);
 			const auto i = ranges::find(
 				_participants,
 				user,
@@ -216,6 +253,7 @@ void GroupCall::applyParticipantsSlice(
 						.was = *i,
 					};
 					_userBySsrc.erase(i->ssrc);
+					_speakingByActiveFinishes.remove(user);
 					_participants.erase(i);
 					if (sliceSource != ApplySliceSource::SliceLoaded) {
 						_participantUpdates.fire(std::move(update));
@@ -231,10 +269,16 @@ void GroupCall::applyParticipantsSlice(
 				: std::nullopt;
 			const auto canSelfUnmute = !data.is_muted()
 				|| data.is_can_self_unmute();
+			const auto lastActive = data.vactive_date().value_or(
+				was ? was->lastActive : 0);
+			const auto speaking = canSelfUnmute
+				&& ((was ? was->speaking : false)
+					|| (!amInCall
+						&& (lastActive + speakingAfterActive > now)));
 			const auto value = Participant{
 				.user = user,
 				.date = data.vdate().v,
-				.lastActive = was ? was->lastActive : 0,
+				.lastActive = lastActive,
 				.ssrc = uint32(data.vsource().v),
 				.speaking = canSelfUnmute && (was ? was->speaking : false),
 				.muted = data.is_muted(),
@@ -243,8 +287,7 @@ void GroupCall::applyParticipantsSlice(
 			if (i == end(_participants)) {
 				_userBySsrc.emplace(value.ssrc, user);
 				_participants.push_back(value);
-				_channel->owner().unregisterInvitedToCallUser(_id, user);
-				++changedCount;
+				_peer->owner().unregisterInvitedToCallUser(_id, user);
 			} else {
 				if (i->ssrc != value.ssrc) {
 					_userBySsrc.erase(i->ssrc);
@@ -252,6 +295,9 @@ void GroupCall::applyParticipantsSlice(
 				}
 				*i = value;
 			}
+			if (data.is_just_joined()) {
+				++changedCount;
+			}
 			if (sliceSource != ApplySliceSource::SliceLoaded) {
 				_participantUpdates.fire({
 					.was = was,
@@ -262,7 +308,7 @@ void GroupCall::applyParticipantsSlice(
 	}
 	if (sliceSource == ApplySliceSource::UpdateReceived) {
 		_fullCount = changedCount;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}
 }
 
@@ -274,7 +320,7 @@ void GroupCall::applyParticipantsMutes(
 				return;
 			}
 			const auto userId = data.vuser_id().v;
-			const auto user = _channel->owner().user(userId);
+			const auto user = _peer->owner().user(userId);
 			const auto i = ranges::find(
 				_participants,
 				user,
@@ -285,6 +331,7 @@ void GroupCall::applyParticipantsMutes(
 				i->canSelfUnmute = !i->muted || data.is_can_self_unmute();
 				if (!i->canSelfUnmute) {
 					i->speaking = false;
+					_speakingByActiveFinishes.remove(i->user);
 				}
 				_participantUpdates.fire({
 					.was = was,
@@ -295,20 +342,27 @@ void GroupCall::applyParticipantsMutes(
 	}
 }
 
-void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
+void GroupCall::applyLastSpoke(
+		uint32 ssrc,
+		LastSpokeTimes when,
+		crl::time now) {
 	const auto i = _userBySsrc.find(ssrc);
 	if (i == end(_userBySsrc)) {
-		_unknownSpokenSsrcs.emplace(ssrc, when);
-		requestUnknownSsrcs();
+		_unknownSpokenSsrcs[ssrc] = when;
+		requestUnknownParticipants();
 		return;
 	}
 	const auto j = ranges::find(_participants, i->second, &Participant::user);
 	Assert(j != end(_participants));
 
-	const auto speaking = (when + kSpeakStatusKeptFor >= now)
+	_speakingByActiveFinishes.remove(j->user);
+	const auto sounding = (when.anything + kSoundStatusKeptFor >= now)
 		&& j->canSelfUnmute;
-	if (j->speaking != speaking) {
+	const auto speaking = sounding
+		&& (when.voice + kSoundStatusKeptFor >= now);
+	if (j->sounding != sounding || j->speaking != speaking) {
 		const auto was = *j;
+		j->sounding = sounding;
 		j->speaking = speaking;
 		_participantUpdates.fire({
 			.was = was,
@@ -317,15 +371,92 @@ void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
 	}
 }
 
-void GroupCall::requestUnknownSsrcs() {
-	if (_unknownSsrcsRequestId || _unknownSpokenSsrcs.empty()) {
+void GroupCall::applyActiveUpdate(
+		UserId userId,
+		LastSpokeTimes when,
+		UserData *userLoaded) {
+	if (inCall()) {
+		return;
+	}
+	const auto i = userLoaded
+		? ranges::find(
+			_participants,
+			not_null{ userLoaded },
+			&Participant::user)
+		: _participants.end();
+	if (i == end(_participants)) {
+		_unknownSpokenUids[userId] = when;
+		requestUnknownParticipants();
+		return;
+	} else if (!i->canSelfUnmute) {
+		return;
+	}
+	const auto was = std::make_optional(*i);
+	const auto now = crl::now();
+	const auto elapsed = TimeId((now - when.anything) / crl::time(1000));
+	const auto lastActive = base::unixtime::now() - elapsed;
+	const auto finishes = when.anything + kSpeakingAfterActive;
+	if (lastActive <= i->lastActive || finishes <= now) {
+		return;
+	}
+	_speakingByActiveFinishes[i->user] = finishes;
+	if (!_speakingByActiveFinishTimer.isActive()) {
+		_speakingByActiveFinishTimer.callOnce(finishes - now);
+	}
+
+	i->lastActive = lastActive;
+	i->speaking = true;
+	i->canSelfUnmute = true;
+	if (!was->speaking || !was->canSelfUnmute) {
+		_participantUpdates.fire({
+			.was = was,
+			.now = *i,
+		});
+	}
+}
+
+void GroupCall::checkFinishSpeakingByActive() {
+	const auto now = crl::now();
+	auto nearest = 0;
+	auto stop = std::vector<not_null<UserData*>>();
+	for (auto i = begin(_speakingByActiveFinishes); i != end(_speakingByActiveFinishes);) {
+		const auto when = i->second;
+		if (now >= when) {
+			stop.push_back(i->first);
+			i = _speakingByActiveFinishes.erase(i);
+		} else {
+			if (!nearest || nearest > when) {
+				nearest = when;
+			}
+			++i;
+		}
+	}
+	for (const auto user : stop) {
+		const auto i = ranges::find(_participants, user, &Participant::user);
+		if (i->speaking) {
+			const auto was = *i;
+			i->speaking = false;
+			_participantUpdates.fire({
+				.was = was,
+				.now = *i,
+			});
+		}
+	}
+	if (nearest) {
+		_speakingByActiveFinishTimer.callOnce(nearest - now);
+	}
+}
+
+void GroupCall::requestUnknownParticipants() {
+	if (_unknownUsersRequestId
+		|| (_unknownSpokenSsrcs.empty() && _unknownSpokenUids.empty())) {
 		return;
 	}
 	const auto ssrcs = [&] {
 		if (_unknownSpokenSsrcs.size() < kRequestPerPage) {
 			return base::take(_unknownSpokenSsrcs);
 		}
-		auto result = base::flat_map<uint32, crl::time>();
+		auto result = base::flat_map<uint32, LastSpokeTimes>();
 		result.reserve(kRequestPerPage);
 		while (result.size() < kRequestPerPage) {
 			const auto [ssrc, when] = _unknownSpokenSsrcs.back();
@@ -334,40 +465,102 @@ void GroupCall::requestUnknownSsrcs() {
 		}
 		return result;
 	}();
-	auto inputs = QVector<MTPint>();
-	inputs.reserve(ssrcs.size());
+	const auto uids = [&] {
+		if (_unknownSpokenUids.size() + ssrcs.size() < kRequestPerPage) {
+			return base::take(_unknownSpokenUids);
+		}
+		auto result = base::flat_map<UserId, LastSpokeTimes>();
+		const auto available = (kRequestPerPage - int(ssrcs.size()));
+		if (available > 0) {
+			result.reserve(available);
+			while (result.size() < available) {
+				const auto [userId, when] = _unknownSpokenUids.back();
+				result.emplace(userId, when);
+				_unknownSpokenUids.erase(_unknownSpokenUids.end() - 1);
+			}
+		}
+		return result;
+	}();
+	auto ssrcInputs = QVector<MTPint>();
+	ssrcInputs.reserve(ssrcs.size());
 	for (const auto [ssrc, when] : ssrcs) {
-		inputs.push_back(MTP_int(ssrc));
+		ssrcInputs.push_back(MTP_int(ssrc));
 	}
-	_unknownSsrcsRequestId = api().request(MTPphone_GetGroupParticipants(
+	auto uidInputs = QVector<MTPint>();
+	uidInputs.reserve(uids.size());
+	for (const auto [userId, when] : uids) {
+		uidInputs.push_back(MTP_int(userId));
+	}
+	_unknownUsersRequestId = api().request(MTPphone_GetGroupParticipants(
 		input(),
-		MTP_vector<MTPint>(), // ids
-		MTP_vector<MTPint>(inputs),
+		MTP_vector<MTPint>(uidInputs),
+		MTP_vector<MTPint>(ssrcInputs),
 		MTP_string(QString()),
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {
 		result.match([&](const MTPDphone_groupParticipants &data) {
-			_channel->owner().processUsers(data.vusers());
+			_peer->owner().processUsers(data.vusers());
 			applyParticipantsSlice(
 				data.vparticipants().v,
 				ApplySliceSource::UnknownLoaded);
 		});
-		_unknownSsrcsRequestId = 0;
+		_unknownUsersRequestId = 0;
 		const auto now = crl::now();
 		for (const auto [ssrc, when] : ssrcs) {
 			applyLastSpoke(ssrc, when, now);
 			_unknownSpokenSsrcs.remove(ssrc);
 		}
-		requestUnknownSsrcs();
+		for (const auto [userId, when] : uids) {
+			if (const auto user = _peer->owner().userLoaded(userId)) {
+				const auto isParticipant = ranges::contains(
+					_participants,
+					not_null{ user },
+					&Participant::user);
+				if (isParticipant) {
+					applyActiveUpdate(userId, when, user);
+				}
+			}
+			_unknownSpokenUids.remove(userId);
+		}
+		requestUnknownParticipants();
 	}).fail([=](const RPCError &error) {
-		_unknownSsrcsRequestId = 0;
+		_unknownUsersRequestId = 0;
 		for (const auto [ssrc, when] : ssrcs) {
 			_unknownSpokenSsrcs.remove(ssrc);
 		}
-		requestUnknownSsrcs();
+		for (const auto [userId, when] : uids) {
+			_unknownSpokenUids.remove(userId);
+		}
+		requestUnknownParticipants();
 	}).send();
 }
 
+void GroupCall::setInCall() {
+	_unknownSpokenUids.clear();
+	if (_speakingByActiveFinishes.empty()) {
+		return;
+	}
+	auto restartTimer = true;
+	const auto latest = crl::now() + kActiveAfterJoined;
+	for (auto &[user, when] : _speakingByActiveFinishes) {
+		if (when > latest) {
+			when = latest;
+		} else {
+			restartTimer = false;
+		}
+	}
+	if (restartTimer) {
+		_speakingByActiveFinishTimer.callOnce(kActiveAfterJoined);
+	}
+}
+
+bool GroupCall::inCall() const {
+	const auto current = Core::App().calls().currentGroupCall();
+	return (current != nullptr)
+		&& (current->id() == _id)
+		&& (current->state() == Calls::GroupCall::State::Joined);
+}
+
 void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
 	const auto version = update.vversion().v;
 	if (version < _version) {
@@ -404,7 +597,7 @@ bool GroupCall::canChangeJoinMuted() const {
 }
 
 ApiWrap &GroupCall::api() const {
-	return _channel->session().api();
+	return _peer->session().api();
 }
 
 } // namespace Data

Telegram/SourceFiles/data/data_group_call.h

@@ -7,27 +7,37 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/timer.h"
+
 class UserData;
-class ChannelData;
+class PeerData;
 
 class ApiWrap;
 
 namespace Data {
 
+struct LastSpokeTimes {
+	crl::time anything = 0;
+	crl::time voice = 0;
+};
+
 class GroupCall final {
 public:
-	GroupCall(not_null<ChannelData*> channel, uint64 id, uint64 accessHash);
+	GroupCall(not_null<PeerData*> peer, uint64 id, uint64 accessHash);
 	~GroupCall();
 
 	[[nodiscard]] uint64 id() const;
-	[[nodiscard]] not_null<ChannelData*> channel() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
 	[[nodiscard]] MTPInputGroupCall input() const;
 
+	void setPeer(not_null<PeerData*> peer);
+
 	struct Participant {
 		not_null<UserData*> user;
 		TimeId date = 0;
 		TimeId lastActive = 0;
 		uint32 ssrc = 0;
+		bool sounding = false;
 		bool speaking = false;
 		bool muted = false;
 		bool canSelfUnmute = false;
@@ -37,7 +47,7 @@ public:
 		std::optional<Participant> now;
 	};
 
-	static constexpr auto kSpeakStatusKeptFor = crl::time(350);
+	static constexpr auto kSoundStatusKeptFor = crl::time(350);
 
 	[[nodiscard]] auto participants() const
 		-> const std::vector<Participant> &;
@@ -52,11 +62,16 @@ public:
 	void applyUpdate(const MTPDupdateGroupCallParticipants &update);
 	void applyUpdateChecked(
 		const MTPDupdateGroupCallParticipants &update);
-	void applyLastSpoke(uint32 ssrc, crl::time when, crl::time now);
+	void applyLastSpoke(uint32 ssrc, LastSpokeTimes when, crl::time now);
+	void applyActiveUpdate(
+		UserId userId,
+		LastSpokeTimes when,
+		UserData *userLoaded);
 
 	[[nodiscard]] int fullCount() const;
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;
 
+	void setInCall();
 	void reload();
 
 	void setJoinMutedLocally(bool muted);
@@ -71,30 +86,35 @@ private:
 	};
 	[[nodiscard]] ApiWrap &api() const;
 
+	[[nodiscard]] bool inCall() const;
 	void applyCall(const MTPGroupCall &call, bool force);
 	void applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
 		ApplySliceSource sliceSource);
 	void applyParticipantsMutes(
 		const MTPDupdateGroupCallParticipants &update);
-	void requestUnknownSsrcs();
-	void changeChannelEmptyCallFlag();
+	void requestUnknownParticipants();
+	void changePeerEmptyCallFlag();
+	void checkFinishSpeakingByActive();
 
-	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
 	const uint64 _accessHash = 0;
 
+	not_null<PeerData*> _peer;
 	int _version = 0;
 	mtpRequestId _participantsRequestId = 0;
 	mtpRequestId _reloadRequestId = 0;
 
 	std::vector<Participant> _participants;
 	base::flat_map<uint32, not_null<UserData*>> _userBySsrc;
+	base::flat_map<not_null<UserData*>, crl::time> _speakingByActiveFinishes;
+	base::Timer _speakingByActiveFinishTimer;
 	QString _nextOffset;
 	rpl::variable<int> _fullCount = 0;
 
-	base::flat_map<uint32, crl::time> _unknownSpokenSsrcs;
-	mtpRequestId _unknownSsrcsRequestId = 0;
+	base::flat_map<uint32, LastSpokeTimes> _unknownSpokenSsrcs;
+	base::flat_map<UserId, LastSpokeTimes> _unknownSpokenUids;
+	mtpRequestId _unknownUsersRequestId = 0;
 
 	rpl::event_stream<ParticipantUpdate> _participantUpdates;
 	rpl::event_stream<> _participantsSliceAdded;

Telegram/SourceFiles/data/data_peer.cpp

@@ -888,6 +888,26 @@ bool PeerData::canSendPolls() const {
 	return false;
 }
 
+bool PeerData::canManageGroupCall() const {
+	if (const auto chat = asChat()) {
+		return chat->amCreator()
+			|| (chat->adminRights() & ChatAdminRight::f_manage_call);
+	} else if (const auto group = asMegagroup()) {
+		return group->amCreator()
+			|| (group->adminRights() & ChatAdminRight::f_manage_call);
+	}
+	return false;
+}
+
+Data::GroupCall *PeerData::groupCall() const {
+	if (const auto chat = asChat()) {
+		return chat->groupCall();
+	} else if (const auto group = asMegagroup()) {
+		return group->groupCall();
+	}
+	return nullptr;
+}
+
 void PeerData::setIsBlocked(bool is) {
 	const auto status = is
 		? BlockStatus::Blocked

Telegram/SourceFiles/data/data_peer.h

@@ -29,6 +29,7 @@ class Session;
 namespace Data {
 
 class Session;
+class GroupCall;
 
 int PeerColorIndex(PeerId peerId);
 int PeerColorIndex(int32 bareId);
@@ -202,6 +203,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> slowmodeAppliedValue() const;
 	[[nodiscard]] int slowmodeSecondsLeft() const;
 	[[nodiscard]] bool canSendPolls() const;
+	[[nodiscard]] bool canManageGroupCall() const;
 
 	[[nodiscard]] UserData *asUser();
 	[[nodiscard]] const UserData *asUser() const;
@@ -383,6 +385,8 @@ public:
 	}
 	void setLoadedStatus(LoadedStatus status);
 
+	[[nodiscard]] Data::GroupCall *groupCall() const;
+
 	const PeerId id;
 	QString name;
 	MTPinputPeer input = MTP_inputPeerEmpty();

Telegram/SourceFiles/data/data_session.cpp

@@ -604,7 +604,12 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			});
 		}
 
-		chat->setFlags(data.vflags().v);
+		const auto callFlag = MTPDchat::Flag::f_call_not_empty;
+		const auto callNotEmpty = (data.vflags().v & callFlag)
+			|| (chat->groupCall()
+				&& chat->groupCall()->fullCount() > 0);
+		chat->setFlags(data.vflags().v
+			| (callNotEmpty ? callFlag : MTPDchat::Flag(0)));
 		chat->count = data.vparticipants_count().v;
 
 		if (canAddMembers != chat->canAddMembers()) {
@@ -651,13 +656,21 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			channel->setDefaultRestrictions(
 				MTP_chatBannedRights(MTP_flags(0), MTP_int(0)));
 		}
+		const auto callFlag = MTPDchannel::Flag::f_call_not_empty;
+		const auto callNotEmpty = (data.vflags().v & callFlag)
+			|| (channel->groupCall()
+				&& channel->groupCall()->fullCount() > 0);
 		if (minimal) {
 			auto mask = 0
 				| MTPDchannel::Flag::f_broadcast
 				| MTPDchannel::Flag::f_verified
 				| MTPDchannel::Flag::f_megagroup
+				| MTPDchannel::Flag::f_call_active
+				| MTPDchannel::Flag::f_call_not_empty
 				| MTPDchannel_ClientFlag::f_forbidden;
-			channel->setFlags((channel->flags() & ~mask) | (data.vflags().v & mask));
+			channel->setFlags((channel->flags() & ~mask)
+				| (data.vflags().v & mask)
+				| (callNotEmpty ? callFlag : MTPDchannel::Flag(0)));
 			if (channel->input.type() == mtpc_inputPeerEmpty
 				|| channel->inputChannel.type() == mtpc_inputChannelEmpty) {
 				channel->setAccessHash(data.vaccess_hash().value_or_empty());
@@ -686,9 +699,6 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			} else {
 				channel->setUnavailableReasons({});
 			}
-			const auto callFlag = MTPDchannel::Flag::f_call_not_empty;
-			const auto callNotEmpty = (data.vflags().v & callFlag)
-				|| (channel->call() && channel->call()->fullCount() > 0);
 			channel->setFlags(data.vflags().v
 				| (callNotEmpty ? callFlag : MTPDchannel::Flag(0)));
 			//if (const auto feedId = data.vfeed_id()) { // #feed
@@ -804,14 +814,6 @@ void Session::unregisterGroupCall(not_null<GroupCall*> call) {
 	_groupCalls.remove(call->id());
 }
 
-rpl::producer<Session::GroupCallDiscard> Session::groupCallDiscards() const {
-	return _groupCallDiscarded.events();
-}
-
-void Session::groupCallDiscarded(uint64 id, int duration) {
-	_groupCallDiscarded.fire({ id, duration });
-}
-
 GroupCall *Session::groupCall(uint64 callId) const {
 	const auto i = _groupCalls.find(callId);
 	return (i != end(_groupCalls)) ? i->second.get() : nullptr;
@@ -826,9 +828,9 @@ auto Session::invitedToCallUsers(uint64 callId) const
 
 void Session::registerInvitedToCallUser(
 		uint64 callId,
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		not_null<UserData*> user) {
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	if (call && call->id() == callId) {
 		const auto inCall = ranges::contains(
 			call->participants(),
@@ -839,6 +841,7 @@ void Session::registerInvitedToCallUser(
 		}
 	}
 	_invitedToCallUsers[callId].emplace(user);
+	_invitesToCalls.fire({ callId, user });
 }
 
 void Session::unregisterInvitedToCallUser(
@@ -1164,6 +1167,7 @@ void Session::setupMigrationViewer() {
 			return;
 		}
 
+		chat->clearGroupCall();
 		if (const auto from = historyLoaded(chat)) {
 			if (const auto to = historyLoaded(channel)) {
 				if (to->inChatList() && from->inChatList()) {

Telegram/SourceFiles/data/data_session.h

@@ -158,21 +158,22 @@ public:
 	void unregisterGroupCall(not_null<GroupCall*> call);
 	GroupCall *groupCall(uint64 callId) const;
 
-	struct GroupCallDiscard {
-		uint64 id = 0;
-		int duration = 0;
-	};
-	rpl::producer<GroupCallDiscard> groupCallDiscards() const;
-	void groupCallDiscarded(uint64 id, int duration);
-
 	[[nodiscard]] auto invitedToCallUsers(uint64 callId) const
 		-> const base::flat_set<not_null<UserData*>> &;
 	void registerInvitedToCallUser(
 		uint64 callId,
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		not_null<UserData*> user);
 	void unregisterInvitedToCallUser(uint64 callId, not_null<UserData*> user);
 
+	struct InviteToCall {
+		uint64 id = 0;
+		not_null<UserData*> user;
+	};
+	[[nodiscard]] rpl::producer<InviteToCall> invitesToCalls() const {
+		return _invitesToCalls.events();
+	}
+
 	void enumerateUsers(Fn<void(not_null<UserData*>)> action) const;
 	void enumerateGroups(Fn<void(not_null<PeerData*>)> action) const;
 	void enumerateChannels(Fn<void(not_null<ChannelData*>)> action) const;
@@ -930,8 +931,8 @@ private:
 	base::flat_set<not_null<ViewElement*>> _heavyViewParts;
 
 	base::flat_map<uint64, not_null<GroupCall*>> _groupCalls;
+	rpl::event_stream<InviteToCall> _invitesToCalls;
 	base::flat_map<uint64, base::flat_set<not_null<UserData*>>> _invitedToCallUsers;
-	rpl::event_stream<GroupCallDiscard> _groupCallDiscarded;
 
 	History *_topPromoted = nullptr;
 

Telegram/SourceFiles/data/data_shared_media.cpp

@@ -56,7 +56,7 @@ void SharedMediaShowOverview(
 				return;
 			}
 		}
-		windows.front()->showSection(Info::Memento(
+		windows.front()->showSection(std::make_shared<Info::Memento>(
 			history->peer,
 			Info::Section(type)));
 	}

Telegram/SourceFiles/data/stickers/data_stickers.cpp

@@ -321,7 +321,7 @@ bool Stickers::applyArchivedResultFake() {
 					MTP_long(raw->access),
 					MTP_string(raw->title),
 					MTP_string(raw->shortName),
-					MTP_photoSizeEmpty(MTP_string()),
+					MTP_vector<MTPPhotoSize>(),
 					MTP_int(0),
 					MTP_int(raw->count),
 					MTP_int(raw->hash));
@@ -814,10 +814,20 @@ void Stickers::featuredSetsReceived(
 		auto it = sets.find(data->vid().v);
 		const auto title = getSetTitle(*data);
 		const auto installDate = data->vinstalled_date().value_or_empty();
-		const auto thumb = data->vthumb();
-		const auto thumbnail = thumb
-			? Images::FromPhotoSize(&session(), *data, *thumb)
-			: ImageWithLocation();
+		const auto thumbnail = [&] {
+			if (const auto thumbs = data->vthumbs()) {
+				for (const auto &thumb : thumbs->v) {
+					const auto result = Images::FromPhotoSize(
+						&session(),
+						*data,
+						thumb);
+					if (result.location.valid()) {
+						return result;
+					}
+				}
+			}
+			return ImageWithLocation();
+		}();
 		if (it == sets.cend()) {
 			auto setClientFlags = MTPDstickerSet_ClientFlag::f_featured
 				| MTPDstickerSet_ClientFlag::f_not_loaded;
@@ -1126,10 +1136,20 @@ StickersSet *Stickers::feedSet(const MTPDstickerSet &data) {
 	auto it = sets.find(data.vid().v);
 	auto title = getSetTitle(data);
 	auto flags = MTPDstickerSet::Flags(0);
-	const auto thumb = data.vthumb();
-	const auto thumbnail = thumb
-		? Images::FromPhotoSize(&session(), data, *thumb)
-		: ImageWithLocation();
+	const auto thumbnail = [&] {
+		if (const auto thumbs = data.vthumbs()) {
+			for (const auto &thumb : thumbs->v) {
+				const auto result = Images::FromPhotoSize(
+					&session(),
+					data,
+					thumb);
+				if (result.location.valid()) {
+					return result;
+				}
+			}
+		}
+		return ImageWithLocation();
+	}();
 	if (it == sets.cend()) {
 		it = sets.emplace(data.vid().v, std::make_unique<StickersSet>(
 			&owner(),

Telegram/SourceFiles/dialogs/dialogs_widget.cpp

@@ -1776,7 +1776,7 @@ bool Widget::onCancelSearch() {
 			if (const auto peer = _searchInChat.peer()) {
 				Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
 			//} else if (const auto feed = _searchInChat.feed()) { // #feed
-			//	controller()->showSection(HistoryFeed::Memento(feed));
+			//	controller()->showSection(std::make_shared<HistoryFeed::Memento>(feed));
 			} else {
 				Unexpected("Empty key in onCancelSearch().");
 			}
@@ -1800,7 +1800,7 @@ void Widget::onCancelSearchInChat() {
 			if (const auto peer = _searchInChat.peer()) {
 				Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
 			//} else if (const auto feed = _searchInChat.feed()) { // #feed
-			//	controller()->showSection(HistoryFeed::Memento(feed));
+			//	controller()->showSection(std::make_shared<HistoryFeed::Memento>(feed));
 			} else {
 				Unexpected("Empty key in onCancelSearchInPeer().");
 			}

Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp

@@ -21,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/message_field.h"
 #include "boxes/sticker_set_box.h"
 #include "base/platform/base_platform_info.h"
-#include "platform/platform_specific.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "core/application.h"
@@ -1220,9 +1219,7 @@ void InnerWidget::copyContextImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	if (!Platform::SetClipboardImage(image)) {
-		QGuiApplication::clipboard()->setImage(image);
-	}
+	QGuiApplication::clipboard()->setImage(image);
 }
 
 void InnerWidget::copySelectedText() {

Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp

@@ -371,8 +371,8 @@ void Widget::setupShortcuts() {
 	}, lifetime());
 }
 
-std::unique_ptr<Window::SectionMemento> Widget::createMemento() {
-	auto result = std::make_unique<SectionMemento>(channel());
+std::shared_ptr<Window::SectionMemento> Widget::createMemento() {
+	auto result = std::make_shared<SectionMemento>(channel());
 	saveState(result.get());
 	return result;
 }

Telegram/SourceFiles/history/admin_log/history_admin_log_section.h

@@ -59,7 +59,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);
 

Telegram/SourceFiles/history/history.cpp

@@ -1053,9 +1053,11 @@ void History::applyServiceChanges(
 	} break;
 
 	case mtpc_messageActionGroupCall: {
+		const auto &d = action.c_messageActionGroupCall();
 		if (const auto channel = peer->asChannel()) {
-			const auto &d = action.c_messageActionGroupCall();
-			channel->setCall(d.vcall());
+			channel->setGroupCall(d.vcall());
+		} else if (const auto chat = peer->asChat()) {
+			chat->setGroupCall(d.vcall());
 		}
 	} break;
 	}

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -38,7 +38,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/sticker_set_box.h"
 #include "chat_helpers/message_field.h"
 #include "history/history_widget.h"
-#include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
 #include "base/unixtime.h"
 #include "mainwindow.h"
@@ -1900,9 +1899,7 @@ void HistoryInner::copyContextImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	if (!Platform::SetClipboardImage(image)) {
-		QGuiApplication::clipboard()->setImage(image);
-	}
+	QGuiApplication::clipboard()->setImage(image);
 }
 
 void HistoryInner::showStickerPackInfo(not_null<DocumentData*> document) {

Telegram/SourceFiles/history/history_service.cpp

@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_game.h"
 #include "data/data_channel.h"
 #include "data/data_user.h"
+#include "data/data_chat.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "core/application.h"
@@ -38,18 +39,27 @@ namespace {
 
 constexpr auto kPinnedMessageTextLimit = 16;
 
-[[nodiscard]] rpl::producer<bool> ChannelHasThisCallValue(
-		not_null<ChannelData*> channel,
+[[nodiscard]] bool PeerCallKnown(not_null<PeerData*> peer) {
+	if (peer->groupCall() != nullptr) {
+		return true;
+	} else if (const auto chat = peer->asChat()) {
+		return !(chat->flags() & MTPDchat::Flag::f_call_active);
+	} else if (const auto channel = peer->asChannel()) {
+		return !(channel->flags() & MTPDchannel::Flag::f_call_active);
+	}
+	return true;
+}
+
+[[nodiscard]] rpl::producer<bool> PeerHasThisCallValue(
+		not_null<PeerData*> peer,
 		uint64 id) {
-	return channel->session().changes().peerFlagsValue(
-		channel,
+	return peer->session().changes().peerFlagsValue(
+		peer,
 		Data::PeerUpdate::Flag::GroupCall
 	) | rpl::filter([=] {
-		return (channel->call() != nullptr)
-			|| !(channel->flags()
-				& MTPDchannel::Flag::f_call_active);
+		return PeerCallKnown(peer);
 	}) | rpl::map([=] {
-		const auto call = channel->call();
+		const auto call = peer->groupCall();
 		return (call && call->id() == id);
 	}) | rpl::distinct_until_changed(
 	) | rpl::take_while([=](bool hasThisCall) {
@@ -59,15 +69,15 @@ constexpr auto kPinnedMessageTextLimit = 16;
 	);
 }
 
-[[nodiscard]] std::optional<bool> ChannelHasThisCall(
-		not_null<ChannelData*> channel,
+[[nodiscard]] std::optional<bool> PeerHasThisCall(
+		not_null<PeerData*> peer,
 		uint64 id) {
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	return call
 		? std::make_optional(call->id() == id)
-		: (channel->flags() & MTPDchannel::Flag::f_call_active)
-		? std::nullopt
-		: std::make_optional(false);
+		: PeerCallKnown(peer)
+		? std::make_optional(false)
+		: std::nullopt;
 }
 
 [[nodiscard]] uint64 CallIdFromInput(const MTPInputGroupCall &data) {
@@ -76,20 +86,20 @@ constexpr auto kPinnedMessageTextLimit = 16;
 	});
 }
 
-[[nodiscard]] ClickHandlerPtr ChannelCallClickHandler(
-		not_null<ChannelData*> megagroup,
+[[nodiscard]] ClickHandlerPtr GroupCallClickHandler(
+		not_null<PeerData*> peer,
 		uint64 callId) {
 	return std::make_shared<LambdaClickHandler>([=] {
-		const auto call = megagroup->call();
+		const auto call = peer->groupCall();
 		if (call && call->id() == callId) {
-			const auto &windows = megagroup->session().windows();
+			const auto &windows = peer->session().windows();
 			if (windows.empty()) {
-				Core::App().domain().activate(&megagroup->session().account());
+				Core::App().domain().activate(&peer->session().account());
 				if (windows.empty()) {
 					return;
 				}
 			}
-			windows.front()->startOrJoinGroupCall(megagroup);
+			windows.front()->startOrJoinGroupCall(peer);
 		}
 	});
 }
@@ -338,10 +348,8 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 			return prepareDiscardedCallText(duration->v);
 		}
 		const auto callId = CallIdFromInput(action.vcall());
-		const auto channel = history()->peer->asChannel();
-		const auto linkCallId = !channel
-			? 0
-			: ChannelHasThisCall(channel, callId).value_or(false)
+		const auto peer = history()->peer;
+		const auto linkCallId = PeerHasThisCall(peer, callId).value_or(false)
 			? callId
 			: 0;
 		return prepareStartedCallText(linkCallId);
@@ -350,16 +358,14 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	auto prepareInviteToGroupCall = [this](const MTPDmessageActionInviteToGroupCall &action) {
 		const auto callId = CallIdFromInput(action.vcall());
 		const auto owner = &history()->owner();
-		const auto channel = history()->peer->asChannel();
+		const auto peer = history()->peer;
 		for (const auto id : action.vusers().v) {
 			const auto user = owner->user(id.v);
-			if (channel && callId) {
-				owner->registerInvitedToCallUser(callId, channel, user);
+			if (callId) {
+				owner->registerInvitedToCallUser(callId, peer, user);
 			}
 		};
-		const auto linkCallId = !channel
-			? 0
-			: ChannelHasThisCall(channel, callId).value_or(false)
+		const auto linkCallId = PeerHasThisCall(peer, callId).value_or(false)
 			? callId
 			: 0;
 		return prepareInvitedToCallText(action.vusers().v, linkCallId);
@@ -534,10 +540,10 @@ HistoryService::PreparedText HistoryService::prepareStartedCallText(
 		uint64 linkCallId) {
 	auto result = PreparedText{};
 	result.links.push_back(fromLink());
-	const auto channel = history()->peer->asChannel();
 	auto chatText = tr::lng_action_group_call_started_chat(tr::now);
-	if (channel && linkCallId) {
-		result.links.push_back(ChannelCallClickHandler(channel, linkCallId));
+	if (linkCallId) {
+		const auto peer = history()->peer;
+		result.links.push_back(GroupCallClickHandler(peer, linkCallId));
 		chatText = textcmdLink(2, chatText);
 	}
 	result.text = tr::lng_action_group_call_started(
@@ -552,14 +558,14 @@ HistoryService::PreparedText HistoryService::prepareStartedCallText(
 HistoryService::PreparedText HistoryService::prepareInvitedToCallText(
 		const QVector<MTPint> &users,
 		uint64 linkCallId) {
-	const auto channel = history()->peer->asChannel();
-	const auto owner = &channel->owner();
+	const auto owner = &history()->owner();
 	auto chatText = tr::lng_action_invite_user_chat(tr::now);
 	auto result = PreparedText{};
 	result.links.push_back(fromLink());
 	auto linkIndex = 1;
-	if (channel && linkCallId) {
-		result.links.push_back(ChannelCallClickHandler(channel, linkCallId));
+	if (linkCallId) {
+		const auto peer = history()->peer;
+		result.links.push_back(GroupCallClickHandler(peer, linkCallId));
 		chatText = textcmdLink(++linkIndex, chatText);
 	}
 	if (users.size() == 1) {
@@ -929,47 +935,35 @@ void HistoryService::createFromMtp(const MTPDmessageService &message) {
 			const auto id = CallIdFromInput(data.vcall());
 			call->lifetime.destroy();
 
-			history()->owner().groupCallDiscards(
-			) | rpl::filter([=](Data::Session::GroupCallDiscard discard) {
-				return (discard.id == id);
-			}) | rpl::start_with_next([=](
-					Data::Session::GroupCallDiscard discard) {
-				RemoveComponents(HistoryServiceOngoingCall::Bit());
-				updateText(prepareDiscardedCallText(discard.duration));
-			}, call->lifetime);
-
-			if (const auto channel = history()->peer->asChannel()) {
-				const auto has = ChannelHasThisCall(channel, id);
-				if (!has.has_value()) {
-					ChannelHasThisCallValue(
-						channel,
-						id
-					) | rpl::start_with_next([=](bool has) {
-						updateText(prepareStartedCallText(has ? id : 0));
-					}, call->lifetime);
-				} else if (*has) {
-					ChannelHasThisCallValue(
-						channel,
-						id
-					) | rpl::skip(1) | rpl::start_with_next([=](bool has) {
-						Assert(!has);
-						updateText(prepareStartedCallText(0));
-					}, call->lifetime);
-				}
+			const auto peer = history()->peer;
+			const auto has = PeerHasThisCall(peer, id);
+			if (!has.has_value()) {
+				PeerHasThisCallValue(
+					peer,
+					id
+				) | rpl::start_with_next([=](bool has) {
+					updateText(prepareStartedCallText(has ? id : 0));
+				}, call->lifetime);
+			} else if (*has) {
+				PeerHasThisCallValue(
+					peer,
+					id
+				) | rpl::skip(1) | rpl::start_with_next([=](bool has) {
+					Assert(!has);
+					updateText(prepareStartedCallText(0));
+				}, call->lifetime);
 			}
 		}
 	} else if (message.vaction().type() == mtpc_messageActionInviteToGroupCall) {
 		const auto &data = message.vaction().c_messageActionInviteToGroupCall();
 		const auto id = CallIdFromInput(data.vcall());
-		const auto channel = history()->peer->asChannel();
-		const auto has = channel
-			? ChannelHasThisCall(channel, id)
-			: std::make_optional(false);
+		const auto peer = history()->peer;
+		const auto has = PeerHasThisCall(peer, id);
 		auto hasLink = !has.has_value()
-			? ChannelHasThisCallValue(channel, id)
+			? PeerHasThisCallValue(peer, id)
 			: (*has)
-			? ChannelHasThisCallValue(
-				channel,
+			? PeerHasThisCallValue(
+				peer,
 				id) | rpl::skip(1) | rpl::type_erased()
 			: rpl::producer<bool>();
 		if (!hasLink) {

Telegram/SourceFiles/history/history_widget.cpp

@@ -687,7 +687,7 @@ HistoryWidget::HistoryWidget(
 			cancelReply(lastKeyboardUsed);
 			crl::on_main(this, [=, history = action.history]{
 				controller->showSection(
-					HistoryView::ScheduledMemento(history));
+					std::make_shared<HistoryView::ScheduledMemento>(history));
 			});
 		} else {
 			fastShowAtEnd(action.history);
@@ -757,9 +757,6 @@ void HistoryWidget::initVoiceRecordBar() {
 		});
 		_voiceRecordBar->setLockBottom(std::move(scrollHeight));
 	}
-	_voiceRecordBar->setEscFilter([=]() -> bool {
-		return _replyToId || (_nonEmptySelection && _list);
-	});
 
 	_voiceRecordBar->setSendButtonGeometryValue(_send->geometryValue());
 
@@ -776,6 +773,12 @@ void HistoryWidget::initVoiceRecordBar() {
 		return false;
 	});
 
+	const auto applyLocalDraft = [=] {
+		if (_history && _history->localDraft()) {
+			applyDraft();
+		}
+	};
+
 	_voiceRecordBar->sendActionUpdates(
 	) | rpl::start_with_next([=](const auto &data) {
 		if (!_history) {
@@ -802,8 +805,12 @@ void HistoryWidget::initVoiceRecordBar() {
 			data.duration,
 			action);
 		_voiceRecordBar->clearListenState();
+		applyLocalDraft();
 	}, lifetime());
 
+	_voiceRecordBar->cancelRequests(
+	) | rpl::start_with_next(applyLocalDraft, lifetime());
+
 	_voiceRecordBar->lockShowStarts(
 	) | rpl::start_with_next([=] {
 		updateHistoryDownVisibility();
@@ -1498,7 +1505,7 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, U
 		} else if (to.section == Section::Scheduled) {
 			history->setDraft(Data::DraftKey::Scheduled(), std::move(draft));
 			controller()->showSection(
-				HistoryView::ScheduledMemento(history));
+				std::make_shared<HistoryView::ScheduledMemento>(history));
 		} else {
 			history->setLocalDraft(std::move(draft));
 			if (history == _history) {
@@ -1616,6 +1623,10 @@ void HistoryWidget::fastShowAtEnd(not_null<History*> history) {
 void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	InvokeQueued(this, [=] { updateStickersByEmoji(); });
 
+	if (_voiceRecordBar->isActive()) {
+		return;
+	}
+
 	auto draft = !_history
 		? nullptr
 		: _history->localEditDraft()
@@ -2065,7 +2076,7 @@ void HistoryWidget::refreshScheduledToggle() {
 		_scheduled->show();
 		_scheduled->addClickHandler([=] {
 			controller()->showSection(
-				HistoryView::ScheduledMemento(_history));
+				std::make_shared<HistoryView::ScheduledMemento>(_history));
 		});
 		orderWidgets(); // Raise drag areas to the top.
 	} else if (_scheduled && !has) {
@@ -3091,7 +3102,7 @@ void HistoryWidget::send(Api::SendOptions options) {
 		return;
 	}
 
-	if (_voiceRecordBar && _voiceRecordBar->isListenState()) {
+	if (_voiceRecordBar->isListenState()) {
 		_voiceRecordBar->requestToSendWithOptions(options);
 		return;
 	}
@@ -3875,7 +3886,7 @@ bool HistoryWidget::pushTabbedSelectorToThirdSection(
 	Core::App().settings().setTabbedReplacedWithInfo(false);
 	controller()->resizeForThirdSection();
 	controller()->showSection(
-		ChatHelpers::TabbedMemento(),
+		std::make_shared<ChatHelpers::TabbedMemento>(),
 		params.withThirdColumn());
 	return true;
 }
@@ -3906,6 +3917,14 @@ void HistoryWidget::setTabbedPanel(std::unique_ptr<TabbedPanel> panel) {
 	}
 }
 
+bool HistoryWidget::preventsClose(Fn<void()> &&continueCallback) const {
+	if (_voiceRecordBar->isActive()) {
+		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
+		return true;
+	}
+	return false;
+}
+
 void HistoryWidget::toggleTabbedSelectorMode() {
 	if (!_peer) {
 		return;
@@ -4321,7 +4340,7 @@ bool HistoryWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
@@ -5374,7 +5393,7 @@ void HistoryWidget::refreshPinnedBarButton(bool many) {
 			const auto id = _pinnedTracker->currentMessageId();
 			if (id.message) {
 				controller()->showSection(
-					HistoryView::PinnedMemento(
+					std::make_shared<HistoryView::PinnedMemento>(
 						_history,
 						((!_migrated || id.message.channel)
 							? id.message.msg
@@ -5388,17 +5407,18 @@ void HistoryWidget::refreshPinnedBarButton(bool many) {
 void HistoryWidget::setupGroupCallTracker() {
 	Expects(_history != nullptr);
 
-	const auto channel = _history->peer->asChannel();
-	if (!channel) {
+	const auto peer = _history->peer;
+	if (!peer->asMegagroup() && !peer->asChat()) {
 		_groupCallTracker = nullptr;
 		_groupCallBar = nullptr;
 		return;
 	}
 	_groupCallTracker = std::make_unique<HistoryView::GroupCallTracker>(
-		channel);
+		peer);
 	_groupCallBar = std::make_unique<Ui::GroupCallBar>(
 		this,
-		_groupCallTracker->content());
+		_groupCallTracker->content(),
+		Core::App().appDeactivatedValue());
 
 	rpl::single(
 		rpl::empty_value()
@@ -5419,16 +5439,15 @@ void HistoryWidget::setupGroupCallTracker() {
 		_groupCallBar->barClicks(),
 		_groupCallBar->joinClicks()
 	) | rpl::start_with_next([=] {
-		const auto channel = _history->peer->asChannel();
-		if (!channel) {
-			return;
-		} else if (channel->amAnonymous()) {
+		const auto peer = _history->peer;
+		const auto channel = peer->asChannel();
+		if (channel && channel->amAnonymous()) {
 			Ui::ShowMultilineToast({
 				.text = tr::lng_group_call_no_anonymous(tr::now),
 				});
 			return;
-		} else if (channel->call()) {
-			controller()->startOrJoinGroupCall(channel);
+		} else if (peer->groupCall()) {
+			controller()->startOrJoinGroupCall(peer);
 		}
 	}, _groupCallBar->lifetime());
 
@@ -5633,7 +5652,7 @@ void HistoryWidget::editMessage(FullMsgId itemId) {
 }
 
 void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
-	if (_voiceRecordBar && _voiceRecordBar->isListenState()) {
+	if (_voiceRecordBar->isListenState()) {
 		Ui::show(Box<InformBox>(tr::lng_edit_caption_voice(tr::now)));
 		return;
 	}
@@ -6107,6 +6126,8 @@ void HistoryWidget::escape() {
 		_fieldAutocomplete->hideAnimated();
 	} else if (_replyToId && _field->getTextWithTags().text.isEmpty()) {
 		cancelReply();
+	} else if (auto &voice = _voiceRecordBar; voice->isActive()) {
+		voice->showDiscardBox(nullptr, anim::type::normal);
 	} else {
 		_cancelRequests.fire({});
 	}

Telegram/SourceFiles/history/history_widget.h

@@ -119,6 +119,8 @@ public:
 
 	void historyLoaded();
 
+	[[nodiscard]] bool preventsClose(Fn<void()> &&continueCallback) const;
+
 	// When resizing the widget with top edge moved up or down and we
 	// want to add this top movement to the scroll position, so inner
 	// content will not move.

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

@@ -796,6 +796,9 @@ void ComposeControls::showStarted() {
 	if (_voiceRecordBar) {
 		_voiceRecordBar->hideFast();
 	}
+	if (_autocomplete) {
+		_autocomplete->hideFast();
+	}
 	_wrap->hide();
 	_writeRestricted->hide();
 }
@@ -810,6 +813,9 @@ void ComposeControls::showFinished() {
 	if (_voiceRecordBar) {
 		_voiceRecordBar->hideFast();
 	}
+	if (_autocomplete) {
+		_autocomplete->hideFast();
+	}
 	updateWrappingVisibility();
 	_voiceRecordBar->orderControls();
 }
@@ -1154,6 +1160,8 @@ void ComposeControls::initAutocomplete() {
 		_autocomplete.get(),
 		[=] { checkAutocomplete(); },
 		Qt::QueuedConnection);
+
+	_autocomplete->hideFast();
 }
 
 void ComposeControls::updateStickersByEmoji() {
@@ -1567,10 +1575,6 @@ void ComposeControls::initVoiceRecordBar() {
 		_voiceRecordBar->setLockBottom(std::move(bottom));
 	}
 
-	_voiceRecordBar->setEscFilter([=] {
-		return (isEditingMessage() || replyingToMessage());
-	});
-
 	_voiceRecordBar->updateSendButtonTypeRequests(
 	) | rpl::start_with_next([=] {
 		updateSendButtonType();
@@ -1639,7 +1643,15 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 		- _send->width()
 		- _tabbedSelectorToggle->width()
 		- (_botCommandShown ? _botCommandStart->width() : 0);
-	_field->resizeToWidth(fieldWidth);
+	{
+		const auto oldFieldHeight = _field->height();
+		_field->resizeToWidth(fieldWidth);
+		// If a height of the field is changed
+		// then this method will be called with the updated size.
+		if (oldFieldHeight != _field->height()) {
+			return;
+		}
+	}
 
 	const auto buttonsTop = size.height() - _attachToggle->height();
 
@@ -1708,7 +1720,11 @@ void ComposeControls::paintBackground(QRect clip) {
 }
 
 void ComposeControls::escape() {
-	_cancelRequests.fire({});
+	if (const auto voice = _voiceRecordBar.get(); voice->isActive()) {
+		voice->showDiscardBox(nullptr, anim::type::normal);
+	} else {
+		_cancelRequests.fire({});
+	}
 }
 
 bool ComposeControls::pushTabbedSelectorToThirdSection(
@@ -1728,7 +1744,7 @@ bool ComposeControls::pushTabbedSelectorToThirdSection(
 		&st::historyRecordVoiceRippleBgActive);
 	_window->resizeForThirdSection();
 	_window->showSection(
-		ChatHelpers::TabbedMemento(),
+		std::make_shared<ChatHelpers::TabbedMemento>(),
 		params.withThirdColumn());
 	return true;
 }
@@ -2130,6 +2146,14 @@ bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
 
+bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
+	if (_voiceRecordBar->isActive()) {
+		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
+		return true;
+	}
+	return false;
+}
+
 void ComposeControls::updateInlineBotQuery() {
 	if (!_history) {
 		return;

Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h

@@ -135,6 +135,8 @@ public:
 	[[nodiscard]] bool isEditingMessage() const;
 	[[nodiscard]] FullMsgId replyingToMessage() const;
 
+	[[nodiscard]] bool preventsClose(Fn<void()> &&continueCallback) const;
+
 	void showForGrab();
 	void showStarted();
 	void showFinished();

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

@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #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 "window/window_session_controller.h"
@@ -61,10 +62,6 @@ enum class FilterType {
 	Cancel,
 };
 
-inline float64 InterpolateF(int a, int b, float64 b_ratio) {
-	return a + float64(b - a) * b_ratio;
-}
-
 [[nodiscard]] auto InactiveColor(const QColor &c) {
 	return QColor(c.red(), c.green(), c.blue(), kInactiveWaveformBarAlpha);
 }
@@ -614,11 +611,14 @@ public:
 	RecordLock(not_null<Ui::RpWidget*> parent);
 
 	void requestPaintProgress(float64 progress);
+	void requestPaintLockToStopProgress(float64 progress);
 
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
 	[[nodiscard]] bool isStopState() const;
 
+	[[nodiscard]] float64 lockToStopProgress() const;
+
 protected:
 	QImage prepareRippleMask() const override;
 	QPoint prepareRippleStartPosition() const override;
@@ -633,9 +633,9 @@ private:
 	const QRect _rippleRect;
 	const QPen _arcPen;
 
-	Ui::Animations::Simple _lockAnimation;
 	Ui::Animations::Simple _lockEnderAnimation;
 
+	float64 _lockToStopProgress = 0.;
 	rpl::variable<float64> _progress = 0.;
 };
 
@@ -665,8 +665,8 @@ void RecordLock::init() {
 		if (!shown) {
 			setCursor(style::cur_default);
 			setAttribute(Qt::WA_TransparentForMouseEvents, true);
-			_lockAnimation.stop();
 			_lockEnderAnimation.stop();
+			_lockToStopProgress = 0.;
 			_progress = 0.;
 		}
 	}, lifetime());
@@ -678,32 +678,13 @@ void RecordLock::init() {
 			const auto top = anim::interpolate(
 				0,
 				height() - st::historyRecordLockTopShadow.height() * 2,
-				_lockAnimation.value(1.));
+				_lockToStopProgress);
 			p.translate(0, top);
 			drawProgress(p);
 			return;
 		}
 		drawProgress(p);
 	}, lifetime());
-
-	locks(
-	) | rpl::start_with_next([=] {
-		const auto &duration = st::historyRecordVoiceShowDuration;
-		const auto from = 0.;
-		const auto to = 1.;
-		auto callback = [=](float64 value) {
-			update();
-			if (value == to) {
-				setCursor(style::cur_pointer);
-				setAttribute(Qt::WA_TransparentForMouseEvents, false);
-
-				resize(
-					st::historyRecordLockTopShadow.width(),
-					st::historyRecordLockTopShadow.width());
-			}
-		};
-		_lockAnimation.start(std::move(callback), from, to, duration);
-	}, lifetime());
 }
 
 void RecordLock::drawProgress(Painter &p) {
@@ -776,8 +757,6 @@ void RecordLock::drawProgress(Painter &p) {
 	}
 	{
 		PainterHighQualityEnabler hq(p);
-		const auto lockToStopProgress =
-			_lockAnimation.value(isLocked() ? 1. : 0);
 		const auto &arcOffset = st::historyRecordLockIconLineSkip;
 		const auto &size = st::historyRecordLockIconSize;
 
@@ -786,18 +765,18 @@ void RecordLock::drawProgress(Painter &p) {
 
 		const auto &blockHeight = st::historyRecordLockIconBottomHeight;
 
-		const auto blockRectWidth = InterpolateF(
+		const auto blockRectWidth = anim::interpolateF(
 			size.width(),
 			st::historyRecordStopIconWidth,
-			lockToStopProgress);
-		const auto blockRectHeight = InterpolateF(
+			_lockToStopProgress);
+		const auto blockRectHeight = anim::interpolateF(
 			blockHeight,
 			st::historyRecordStopIconWidth,
-			lockToStopProgress);
-		const auto blockRectTop = InterpolateF(
+			_lockToStopProgress);
+		const auto blockRectTop = anim::interpolateF(
 			size.height() - blockHeight,
 			std::round((size.height() - blockRectHeight) / 2.),
-			lockToStopProgress);
+			_lockToStopProgress);
 
 		const auto blockRect = QRectF(
 			(size.width() - blockRectWidth) / 2,
@@ -812,11 +791,11 @@ void RecordLock::drawProgress(Painter &p) {
 			inner.x() + (inner.width() - size.width()) / 2,
 			inner.y() + (originTop.height() * 2 - size.height()) / 2);
 		{
-			const auto xRadius = anim::interpolate(2, 3, lockToStopProgress);
+			const auto xRadius = anim::interpolate(2, 3, _lockToStopProgress);
 			p.drawRoundedRect(blockRect, xRadius, 3);
 		}
 
-		const auto offsetTranslate = lockToStopProgress *
+		const auto offsetTranslate = _lockToStopProgress *
 			(lineHeight + arcHeight + _arcPen.width() * 2);
 		p.translate(
 			size.width() - arcOffset,
@@ -838,7 +817,7 @@ void RecordLock::drawProgress(Painter &p) {
 			0,
 			180 * 16);
 
-		const auto lockProgress = 1. - _lockAnimation.value(1.);
+		const auto lockProgress = 1. - _lockToStopProgress;
 		if (progress == 1. && lockProgress < 1.) {
 			p.drawLine(
 				-arcWidth,
@@ -869,6 +848,23 @@ void RecordLock::requestPaintProgress(float64 progress) {
 	setProgress(progress);
 }
 
+void RecordLock::requestPaintLockToStopProgress(float64 progress) {
+	_lockToStopProgress = progress;
+	if (isStopState()) {
+		setCursor(style::cur_pointer);
+		setAttribute(Qt::WA_TransparentForMouseEvents, false);
+
+		resize(
+			st::historyRecordLockTopShadow.width(),
+			st::historyRecordLockTopShadow.width());
+	}
+	update();
+}
+
+float64 RecordLock::lockToStopProgress() const {
+	return _lockToStopProgress;
+}
+
 void RecordLock::setProgress(float64 progress) {
 	_progress = progress;
 	update();
@@ -879,7 +875,7 @@ bool RecordLock::isLocked() const {
 }
 
 bool RecordLock::isStopState() const {
-	return isLocked() && (_lockAnimation.value(1.) == 1.);
+	return isLocked() && (_lockToStopProgress == 1.);
 }
 
 rpl::producer<> RecordLock::locks() const {
@@ -895,6 +891,77 @@ QPoint RecordLock::prepareRippleStartPosition() const {
 	return mapFromGlobal(QCursor::pos()) - _rippleRect.topLeft();
 }
 
+class CancelButton final : public Ui::RippleButton {
+public:
+	CancelButton(not_null<Ui::RpWidget*> parent, int height);
+
+	void requestPaintProgress(float64 progress);
+
+protected:
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void init();
+
+	const int _width;
+	const QRect _rippleRect;
+
+	rpl::variable<float64> _showProgress = 0.;
+
+	Ui::Text::String _text;
+
+};
+
+CancelButton::CancelButton(not_null<Ui::RpWidget*> parent, int height)
+: Ui::RippleButton(parent, st::defaultLightButton.ripple)
+, _width(st::historyRecordCancelButtonWidth)
+, _rippleRect(QRect(0, (height - _width) / 2, _width, _width))
+, _text(st::semiboldTextStyle, tr::lng_selected_clear(tr::now).toUpper()) {
+	resize(_width, height);
+	init();
+}
+
+void CancelButton::init() {
+	_showProgress.value(
+	) | rpl::start_with_next([=](float64 progress) {
+		const auto hasProgress = (progress > 0.);
+		if (isHidden() == !hasProgress) {
+			setVisible(hasProgress);
+		}
+		update();
+	}, lifetime());
+
+	paintRequest(
+	) | rpl::start_with_next([=] {
+		Painter p(this);
+
+		p.setOpacity(_showProgress.current());
+
+		paintRipple(p, _rippleRect.x(), _rippleRect.y());
+
+		p.setPen(st::historyRecordCancelButtonFg);
+		_text.draw(
+			p,
+			0,
+			(height() - _text.minHeight()) / 2,
+			width(),
+			style::al_center);
+	}, lifetime());
+}
+
+QImage CancelButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::ellipseMask(_rippleRect.size());
+}
+
+QPoint CancelButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos()) - _rippleRect.topLeft();
+}
+
+void CancelButton::requestPaintProgress(float64 progress) {
+	_showProgress = progress;
+}
+
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Ui::RpWidget*> sectionWidget,
@@ -909,7 +976,12 @@ VoiceRecordBar::VoiceRecordBar(
 , _level(std::make_unique<VoiceRecordButton>(
 	sectionWidget,
 	_controller->widget()->leaveEvents()))
+, _cancel(std::make_unique<CancelButton>(this, recorderHeight))
 , _startTimer([=] { startRecording(); })
+, _message(
+	st::historyRecordTextStyle,
+	tr::lng_record_cancel(tr::now),
+	TextParseOptions{ TextParseMultiline, 0, 0, Qt::LayoutDirectionAuto })
 , _cancelFont(st::historyRecordFont) {
 	resize(QSize(parent->width(), recorderHeight));
 	init();
@@ -996,6 +1068,7 @@ void VoiceRecordBar::init() {
 				_cancelFont->width(FormatVoiceDuration(kMaxSamples)),
 				ascent);
 		}
+		_cancel->moveToLeft((size.width() - _cancel->width()) / 2, 0);
 		updateMessageGeometry();
 		updateLockGeometry();
 	}, lifetime());
@@ -1009,6 +1082,14 @@ void VoiceRecordBar::init() {
 		p.fillRect(clip, st::historyComposeAreaBg);
 
 		p.setOpacity(std::min(p.opacity(), 1. - showListenAnimationRatio()));
+		const auto opacity = p.opacity();
+		_cancel->requestPaintProgress(_lock->isStopState()
+			? (opacity * _lock->lockToStopProgress())
+			: 0.);
+
+		if (!opacity) {
+			return;
+		}
 		if (clip.intersects(_messageRect)) {
 			// The message should be painted first to avoid flickering.
 			drawMessage(p, activeAnimationRatio());
@@ -1059,7 +1140,8 @@ void VoiceRecordBar::init() {
 			const auto &duration = st::historyRecordVoiceShowDuration;
 			auto callback = [=](float64 value) {
 				_listen->requestPaintProgress(value);
-				_level->requestPaintProgress(to - value);
+				const auto reverseValue = to - value;
+				_level->requestPaintProgress(reverseValue);
 				update();
 				if (to == value) {
 					_recordingLifetime.destroy();
@@ -1073,7 +1155,6 @@ void VoiceRecordBar::init() {
 
 	_lock->locks(
 	) | rpl::start_with_next([=] {
-		installClickOutsideFilter();
 		_level->setType(VoiceRecordButton::Type::Send);
 
 		_level->clicks(
@@ -1088,23 +1169,15 @@ void VoiceRecordBar::init() {
 		) | rpl::start_with_next([=](bool enter) {
 			_inField = enter;
 		}, _recordingLifetime);
-	}, lifetime());
 
-	rpl::merge(
-		_lock->locks(),
-		shownValue() | rpl::to_empty
-	) | rpl::start_with_next([=] {
-		const auto direction = Qt::LayoutDirectionAuto;
-		_message.setText(
-			st::historyRecordTextStyle,
-			_lock->isLocked()
-				? tr::lng_record_lock_cancel(tr::now)
-				: tr::lng_record_cancel(tr::now),
-			TextParseOptions{ TextParseMultiline, 0, 0, direction });
-
-		updateMessageGeometry();
-		// Update a whole widget to clear a previous text.
-		update();
+		const auto &duration = st::historyRecordVoiceShowDuration;
+		const auto from = 0.;
+		const auto to = 1.;
+		auto callback = [=](float64 value) {
+			_lock->requestPaintLockToStopProgress(value);
+			update();
+		};
+		_lockToStopAnimation.start(std::move(callback), from, to, duration);
 	}, lifetime());
 
 	_send->events(
@@ -1139,6 +1212,10 @@ void VoiceRecordBar::init() {
 
 		installListenStateFilter();
 	}, lifetime());
+
+	_cancel->setClickedCallback([=] {
+		hideAnimated();
+	});
 }
 
 void VoiceRecordBar::activeAnimate(bool active) {
@@ -1176,10 +1253,6 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	_showAnimation.start(std::move(animationCallback), from, to, duration);
 }
 
-void VoiceRecordBar::setEscFilter(Fn<bool()> &&callback) {
-	_escFilter = std::move(callback);
-}
-
 void VoiceRecordBar::setStartRecordingFilter(Fn<bool()> &&callback) {
 	_startRecordingFilter = std::move(callback);
 }
@@ -1230,6 +1303,9 @@ void VoiceRecordBar::startRecording() {
 		}, [=] {
 			stop(false);
 		}, _recordingLifetime);
+		_recordingLifetime.add([=] {
+			_recording = false;
+		});
 	};
 	visibilityAnimate(true, std::move(appearanceCallback));
 	show();
@@ -1290,12 +1366,12 @@ void VoiceRecordBar::stop(bool send) {
 void VoiceRecordBar::finish() {
 	_recordingLifetime.destroy();
 	_lockShowing = false;
-	_recording = false;
 	_inField = false;
 	_redCircleProgress = 0.;
 	_recordingSamples = 0;
 
 	_showAnimation.stop();
+	_lockToStopAnimation.stop();
 
 	_listen = nullptr;
 
@@ -1313,6 +1389,7 @@ void VoiceRecordBar::hideFast() {
 void VoiceRecordBar::stopRecording(StopType type) {
 	using namespace ::Media::Capture;
 	if (type == StopType::Cancel) {
+		_cancelRequests.fire({});
 		instance()->stop();
 		return;
 	}
@@ -1383,12 +1460,17 @@ void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
 			st::historyRecordCancelActive,
 			1. - recordActive));
 
+	const auto opacity = p.opacity();
+	p.setOpacity(opacity * (1. - _lock->lockToStopProgress()));
+
 	_message.draw(
 		p,
 		_messageRect.x(),
 		_messageRect.y(),
 		_messageRect.width(),
 		style::al_center);
+
+	p.setOpacity(opacity);
 }
 
 void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
@@ -1410,15 +1492,24 @@ rpl::producer<VoiceToSend> VoiceRecordBar::sendVoiceRequests() const {
 	return _sendVoiceRequests.events();
 }
 
+rpl::producer<> VoiceRecordBar::cancelRequests() const {
+	return _cancelRequests.events();
+}
+
 bool VoiceRecordBar::isRecording() const {
 	return _recording.current();
 }
 
+bool VoiceRecordBar::isActive() const {
+	return isRecording() || isListenState();
+}
+
 void VoiceRecordBar::hideAnimated() {
 	if (isHidden()) {
 		return;
 	}
-	visibilityAnimate(false, [=] { hide(); });
+	_lockShowing = false;
+	visibilityAnimate(false, [=] { hideFast(); });
 }
 
 void VoiceRecordBar::finishAnimating() {
@@ -1493,76 +1584,6 @@ void VoiceRecordBar::orderControls() {
 	_lock->raise();
 }
 
-void VoiceRecordBar::installClickOutsideFilter() {
-	const auto box = _recordingLifetime.make_state<QPointer<ConfirmBox>>();
-	const auto showBox = [=] {
-		if (*box) {
-			return;
-		}
-		auto sure = [=](Fn<void()> &&close) {
-			stop(false);
-			close();
-		};
-		*box = Ui::show(Box<ConfirmBox>(
-			tr::lng_record_lock_cancel_sure(tr::now),
-			tr::lng_record_lock_discard(tr::now),
-			st::attentionBoxButton,
-			std::move(sure)));
-	};
-
-	const auto computeResult = [=](not_null<QEvent*> e) {
-		using Type = FilterType;
-		if (!_lock->isLocked()) {
-			return Type::Continue;
-		}
-		const auto type = e->type();
-		const auto noBox = !(*box);
-		if (type == QEvent::KeyPress) {
-			const auto key = static_cast<QKeyEvent*>(e.get())->key();
-			const auto isEsc = (key == Qt::Key_Escape);
-			const auto isEnter = (key == Qt::Key_Enter
-				|| key == Qt::Key_Return);
-			if (noBox) {
-				if (isEnter) {
-					stop(true);
-					return Type::Cancel;
-				} else if (isEsc && (_escFilter && _escFilter())) {
-					return Type::Continue;
-				}
-				return Type::ShowBox;
-			}
-			return (isEsc || isEnter) ? Type::Continue : Type::ShowBox;
-		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
-			return Type::ShowBox;
-		} else if (type == QEvent::MouseButtonPress) {
-			return (noBox && !_inField.current() && !_lock->underMouse())
-				? Type::ShowBox
-				: Type::Continue;
-		}
-		return Type::Continue;
-	};
-
-	auto filterCallback = [=](not_null<QEvent*> e) {
-		using Result = base::EventFilterResult;
-		switch(computeResult(e)) {
-		case FilterType::ShowBox: {
-			showBox();
-			return Result::Cancel;
-		}
-		case FilterType::Continue: return Result::Continue;
-		case FilterType::Cancel: return Result::Cancel;
-		default: return Result::Continue;
-		}
-	};
-
-	auto filter = base::install_event_filter(
-		QCoreApplication::instance(),
-		std::move(filterCallback));
-
-	_recordingLifetime.make_state<base::unique_qptr<QObject>>(
-		std::move(filter));
-}
-
 void VoiceRecordBar::installListenStateFilter() {
 	auto keyFilterCallback = [=](not_null<QEvent*> e) {
 		using Result = base::EventFilterResult;
@@ -1575,7 +1596,6 @@ void VoiceRecordBar::installListenStateFilter() {
 			const auto keyEvent = static_cast<QKeyEvent*>(e.get());
 			const auto key = keyEvent->key();
 			const auto isSpace = (key == Qt::Key_Space);
-			const auto isEsc = (key == Qt::Key_Escape);
 			const auto isEnter = (key == Qt::Key_Enter
 				|| key == Qt::Key_Return);
 			if (isSpace && !keyEvent->isAutoRepeat() && _listen) {
@@ -1586,14 +1606,6 @@ void VoiceRecordBar::installListenStateFilter() {
 				requestToSendWithOptions({});
 				return Result::Cancel;
 			}
-			if (isEsc) {
-				if (_escFilter && _escFilter()) {
-					return Result::Continue;
-				} else {
-					hideAnimated();
-					return Result::Cancel;
-				}
-			}
 			return Result::Continue;
 		}
 		default: return Result::Continue;
@@ -1608,4 +1620,30 @@ void VoiceRecordBar::installListenStateFilter() {
 		std::move(keyFilter));
 }
 
+void VoiceRecordBar::showDiscardBox(
+		Fn<void()> &&callback,
+		anim::type animated) {
+	if (!isActive()) {
+		return;
+	}
+	auto sure = [=, callback = std::move(callback)](Fn<void()> &&close) {
+		if (animated == anim::type::instant) {
+			hideFast();
+		} else {
+			hideAnimated();
+		}
+		close();
+		if (callback) {
+			callback();
+		}
+	};
+	Ui::show(Box<ConfirmBox>(
+		(isListenState()
+			? tr::lng_record_listen_cancel_sure
+			: tr::lng_record_lock_cancel_sure)(tr::now),
+		tr::lng_record_lock_discard(tr::now),
+		st::attentionBoxButton,
+		std::move(sure)));
+}
+
 } // namespace HistoryView::Controls

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

@@ -28,6 +28,7 @@ namespace HistoryView::Controls {
 class VoiceRecordButton;
 class ListenWrap;
 class RecordLock;
+class CancelButton;
 
 class VoiceRecordBar final : public Ui::RpWidget {
 public:
@@ -47,6 +48,10 @@ public:
 		int recorderHeight);
 	~VoiceRecordBar();
 
+	void showDiscardBox(
+		Fn<void()> &&callback,
+		anim::type animated = anim::type::instant);
+
 	void startRecording();
 	void finishAnimating();
 	void hideAnimated();
@@ -57,6 +62,7 @@ public:
 
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
+	[[nodiscard]] rpl::producer<> cancelRequests() const;
 	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 	[[nodiscard]] rpl::producer<not_null<QEvent*>> lockViewportEvents() const;
@@ -66,12 +72,12 @@ public:
 
 	void setLockBottom(rpl::producer<int> &&bottom);
 	void setSendButtonGeometryValue(rpl::producer<QRect> &&geometry);
-	void setEscFilter(Fn<bool()> &&callback);
 	void setStartRecordingFilter(Fn<bool()> &&callback);
 
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isListenState() const;
+	[[nodiscard]] bool isActive() const;
 
 private:
 	enum class StopType {
@@ -99,7 +105,6 @@ private:
 	void drawMessage(Painter &p, float64 recordActive);
 
 	void startRedCircleAnimation();
-	void installClickOutsideFilter();
 	void installListenStateFilter();
 
 	bool isTypeRecord() const;
@@ -119,12 +124,14 @@ private:
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
 	const std::unique_ptr<VoiceRecordButton> _level;
+	const std::unique_ptr<CancelButton> _cancel;
 	std::unique_ptr<ListenWrap> _listen;
 
 	base::Timer _startTimer;
 
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
+	rpl::event_stream<> _cancelRequests;
 	rpl::event_stream<> _listenChanges;
 
 	int _centerY = 0;
@@ -134,7 +141,6 @@ private:
 
 	Ui::Text::String _message;
 
-	Fn<bool()> _escFilter;
 	Fn<bool()> _startRecordingFilter;
 
 	rpl::variable<bool> _recording = false;
@@ -148,6 +154,7 @@ private:
 	rpl::lifetime _recordingLifetime;
 
 	Ui::Animations::Simple _showLockAnimation;
+	Ui::Animations::Simple _lockToStopAnimation;
 	Ui::Animations::Simple _showListenAnimation;
 	Ui::Animations::Simple _activeAnimation;
 	Ui::Animations::Simple _showAnimation;

Telegram/SourceFiles/history/view/history_view_context_menu.cpp

@@ -39,7 +39,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_scheduled_messages.h"
 #include "core/file_utilities.h"
 #include "base/platform/base_platform_info.h"
-#include "platform/platform_specific.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
@@ -126,9 +125,7 @@ void CopyImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	if (!Platform::SetClipboardImage(image)) {
-		QGuiApplication::clipboard()->setImage(image);
-	}
+	QGuiApplication::clipboard()->setImage(image);
 }
 
 void ShowStickerPackInfo(

Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp

@@ -61,8 +61,8 @@ void GenerateUserpicsInRow(
 	}
 }
 
-GroupCallTracker::GroupCallTracker(not_null<ChannelData*> channel)
-: _channel(channel) {
+GroupCallTracker::GroupCallTracker(not_null<PeerData*> peer)
+: _peer(peer) {
 }
 
 rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
@@ -118,7 +118,10 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		}
 		for (auto i = 0; i != kLimit - already; ++i) {
 			if (adding[i]) {
-				state->userpics.push_back(UserpicInRow{ adding[i]->user });
+				state->userpics.push_back(UserpicInRow{
+					.peer = adding[i]->user,
+					.speaking = adding[i]->speaking,
+				});
 			}
 		}
 		return true;
@@ -133,12 +136,19 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		if (!result) {
 			return false;
 		}
-		GenerateUserpicsInRow(
-			state->current.userpics,
-			state->userpics,
-			st);
+		state->current.users.reserve(state->userpics.size());
+		state->current.users.clear();
 		state->someUserpicsNotLoaded = false;
-		for (const auto &userpic : state->userpics) {
+		for (auto &userpic : state->userpics) {
+			userpic.peer->loadUserpic();
+			const auto pic = userpic.peer->genUserpic(userpic.view, st.size);
+			userpic.uniqueKey = userpic.peer->userpicUniqueKey(userpic.view);
+			state->current.users.push_back({
+				.userpic = pic.toImage(),
+				.userpicKey = userpic.uniqueKey,
+				.id = userpic.peer->bareId(),
+				.speaking = userpic.speaking,
+			});
 			if (userpic.peer->hasUserpic()
 				&& userpic.peer->useEmptyUserpic(userpic.view)) {
 				state->someUserpicsNotLoaded = true;
@@ -172,12 +182,17 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		Expects(state->userpics.size() <= kLimit);
 
 		const auto &participants = call->participants();
-		auto i = state->userpics.begin();
+		auto i = begin(state->userpics);
 
 		// Find where to put a new speaking userpic.
-		for (; i != state->userpics.end(); ++i) {
+		for (; i != end(state->userpics); ++i) {
 			if (i->peer == user) {
-				return false;
+				if (i->speaking) {
+					return false;
+				}
+				const auto index = i - begin(state->userpics);
+				state->current.users[index].speaking = i->speaking = true;
+				return true;
 			}
 			const auto j = ranges::find(
 				participants,
@@ -194,7 +209,10 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		}
 
 		// Add the new speaking to the place we found.
-		const auto added = state->userpics.insert(i, UserpicInRow{ user });
+		const auto added = state->userpics.insert(i, UserpicInRow{
+			.peer = user,
+			.speaking = true,
+		});
 
 		// Remove him from the tail, if he was there.
 		for (auto i = added + 1; i != state->userpics.end(); ++i) {
@@ -252,8 +270,27 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 				if (CheckPushToFront(state, call, user, st)) {
 					pushNext();
 				}
-			} else if (RegenerateUserpics(state, call, st)) {
-				pushNext();
+			} else {
+				auto updateSpeakingState = update.was.has_value()
+					&& (update.now->speaking != update.was->speaking);
+				if (updateSpeakingState) {
+					const auto i = ranges::find(
+						state->userpics,
+						user,
+						&UserpicInRow::peer);
+					if (i != end(state->userpics)) {
+						const auto index = i - begin(state->userpics);
+						state->current.users[index].speaking
+							= i->speaking
+							= update.now->speaking;
+					} else {
+						updateSpeakingState = false;
+					}
+				}
+				if (RegenerateUserpics(state, call, st)
+					|| updateSpeakingState) {
+					pushNext();
+				}
 			}
 		}, lifetime);
 
@@ -262,7 +299,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 			return RegenerateUserpics(state, call, st);
 		}) | rpl::start_with_next(pushNext, lifetime);
 
-		call->channel()->session().downloaderTaskFinished(
+		call->peer()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded;
 		}) | rpl::start_with_next([=] {
@@ -289,15 +326,15 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 }
 
 rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::content() const {
-	const auto channel = _channel;
+	const auto peer = _peer;
 	return rpl::combine(
-		channel->session().changes().peerFlagsValue(
-			channel,
+		peer->session().changes().peerFlagsValue(
+			peer,
 			Data::PeerUpdate::Flag::GroupCall),
 		Core::App().calls().currentGroupCallValue()
 	) | rpl::map([=](const auto&, Calls::GroupCall *current) {
-		const auto call = channel->call();
-		return (call && (!current || current->channel() != channel))
+		const auto call = peer->groupCall();
+		return (call && (!current || current->peer() != peer))
 			? call
 			: nullptr;
 	}) | rpl::distinct_until_changed(

Telegram/SourceFiles/history/view/history_view_group_call_tracker.h

@@ -22,6 +22,7 @@ namespace HistoryView {
 
 struct UserpicInRow {
 	not_null<PeerData*> peer;
+	bool speaking = false;
 	mutable std::shared_ptr<Data::CloudImageView> view;
 	mutable InMemoryKey uniqueKey;
 };
@@ -40,7 +41,7 @@ void GenerateUserpicsInRow(
 
 class GroupCallTracker final {
 public:
-	GroupCallTracker(not_null<ChannelData*> channel);
+	explicit GroupCallTracker(not_null<PeerData*> peer);
 
 	[[nodiscard]] rpl::producer<Ui::GroupCallBarContent> content() const;
 	[[nodiscard]] rpl::producer<> joinClicks() const;
@@ -50,7 +51,7 @@ public:
 		const UserpicsInRowStyle &st);
 
 private:
-	not_null<ChannelData*> _channel;
+	const not_null<PeerData*> _peer;
 
 	rpl::event_stream<> _joinClicks;
 

Telegram/SourceFiles/history/view/history_view_pinned_section.cpp

@@ -342,8 +342,8 @@ void PinnedWidget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<Window::SectionMemento> PinnedWidget::createMemento() {
-	auto result = std::make_unique<PinnedMemento>(history());
+std::shared_ptr<Window::SectionMemento> PinnedWidget::createMemento() {
+	auto result = std::make_shared<PinnedMemento>(history());
 	saveState(result.get());
 	return result;
 }

Telegram/SourceFiles/history/view/history_view_pinned_section.h

@@ -56,7 +56,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 	bool showMessage(
 		PeerId peerId,
 		const Window::SectionShow &params,

Telegram/SourceFiles/history/view/history_view_replies_section.cpp

@@ -603,7 +603,7 @@ bool RepliesWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
@@ -1315,6 +1315,10 @@ Dialogs::RowDescriptor RepliesWidget::activeChat() const {
 	};
 }
 
+bool RepliesWidget::preventsClose(Fn<void()> &&continueCallback) const {
+	return _composeControls->preventsClose(std::move(continueCallback));
+}
+
 QPixmap RepliesWidget::grabForShowAnimation(const Window::SectionSlideParams &params) {
 	_topBar->updateControlsVisibility();
 	if (params.withTopBarShadow) _topBarShadow->hide();
@@ -1363,8 +1367,8 @@ bool RepliesWidget::returnTabbedSelector() {
 	return _composeControls->returnTabbedSelector();
 }
 
-std::unique_ptr<Window::SectionMemento> RepliesWidget::createMemento() {
-	auto result = std::make_unique<RepliesMemento>(history(), _rootId);
+std::shared_ptr<Window::SectionMemento> RepliesWidget::createMemento() {
+	auto result = std::make_shared<RepliesMemento>(history(), _rootId);
 	saveState(result.get());
 	return result;
 }

Telegram/SourceFiles/history/view/history_view_replies_section.h

@@ -75,6 +75,7 @@ public:
 
 	[[nodiscard]] not_null<History*> history() const;
 	Dialogs::RowDescriptor activeChat() const override;
+	bool preventsClose(Fn<void()> &&continueCallback) const override;
 
 	bool hasTopBarShadow() const override {
 		return true;
@@ -86,7 +87,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 	bool showMessage(
 		PeerId peerId,
 		const Window::SectionShow &params,

Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp

@@ -335,7 +335,7 @@ bool ScheduledWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
@@ -894,6 +894,10 @@ Dialogs::RowDescriptor ScheduledWidget::activeChat() const {
 	};
 }
 
+bool ScheduledWidget::preventsClose(Fn<void()> &&continueCallback) const {
+	return _composeControls->preventsClose(std::move(continueCallback));
+}
+
 QPixmap ScheduledWidget::grabForShowAnimation(const Window::SectionSlideParams &params) {
 	_topBar->updateControlsVisibility();
 	if (params.withTopBarShadow) _topBarShadow->hide();
@@ -937,8 +941,8 @@ bool ScheduledWidget::returnTabbedSelector() {
 	return _composeControls->returnTabbedSelector();
 }
 
-std::unique_ptr<Window::SectionMemento> ScheduledWidget::createMemento() {
-	auto result = std::make_unique<ScheduledMemento>(history());
+std::shared_ptr<Window::SectionMemento> ScheduledWidget::createMemento() {
+	auto result = std::make_shared<ScheduledMemento>(history());
 	saveState(result.get());
 	return result;
 }

Telegram/SourceFiles/history/view/history_view_scheduled_section.h

@@ -60,6 +60,7 @@ public:
 
 	not_null<History*> history() const;
 	Dialogs::RowDescriptor activeChat() const override;
+	bool preventsClose(Fn<void()> &&continueCallback) const override;
 
 	bool hasTopBarShadow() const override {
 		return true;
@@ -71,7 +72,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	void setInternalState(
 		const QRect &geometry,

Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp

@@ -220,23 +220,7 @@ void TopBarWidget::call() {
 
 void TopBarWidget::groupCall() {
 	if (const auto peer = _activeChat.key.peer()) {
-		if (const auto megagroup = peer->asMegagroup()) {
-			_controller->startOrJoinGroupCall(megagroup);
-		} else if (const auto chat = peer->asChat()) {
-			const auto callback = [=] {
-				Ui::hideLayer();
-				const auto start = [=](not_null<ChannelData*> megagroup) {
-					_controller->startOrJoinGroupCall(megagroup, true);
-				};
-				peer->session().api().migrateChat(
-					chat,
-					crl::guard(this, start));
-			};
-			Ui::show(Box<ConfirmBox>(
-				tr::lng_group_call_create_sure(tr::now),
-				tr::lng_continue(tr::now),
-				crl::guard(this, callback)));
-		}
+		_controller->startOrJoinGroupCall(peer);
 	}
 }
 
@@ -509,15 +493,15 @@ void TopBarWidget::infoClicked() {
 	} else if (key.folder()) {
 		_controller->closeFolder();
 	//} else if (const auto feed = _activeChat.feed()) { // #feed
-	//	_controller->showSection(Info::Memento(
+	//	_controller->showSection(std::make_shared<Info::Memento>(
 	//		feed,
 	//		Info::Section(Info::Section::Type::Profile)));
 	} else if (key.peer()->isSelf()) {
-		_controller->showSection(Info::Memento(
+		_controller->showSection(std::make_shared<Info::Memento>(
 			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
 	} else if (key.peer()->isRepliesChat()) {
-		_controller->showSection(Info::Memento(
+		_controller->showSection(std::make_shared<Info::Memento>(
 			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
 	} else {
@@ -543,6 +527,7 @@ void TopBarWidget::setActiveChat(
 	}
 	_activeChat = activeChat;
 	_sendAction = sendAction;
+	_titlePeerText.clear();
 	_back->clearState();
 	update();
 
@@ -662,11 +647,14 @@ void TopBarWidget::updateControlsGeometry() {
 	}
 	_infoToggle->moveToRight(_rightTaken, otherButtonsTop);
 	if (!_infoToggle->isHidden()) {
-		_rightTaken += _infoToggle->width() + st::topBarSkip;
+		_infoToggle->moveToRight(_rightTaken, otherButtonsTop);
+		_rightTaken += _infoToggle->width();
+	}
+	if (!_call->isHidden() || !_groupCall->isHidden()) {
+		_call->moveToRight(_rightTaken, otherButtonsTop);
+		_groupCall->moveToRight(_rightTaken, otherButtonsTop);
+		_rightTaken += _call->width();
 	}
-	_call->moveToRight(_rightTaken, otherButtonsTop);
-	_groupCall->moveToRight(_rightTaken, otherButtonsTop);
-	_rightTaken += _call->width();
 	_search->moveToRight(_rightTaken, otherButtonsTop);
 	_rightTaken += _search->width() + st::topBarCallSkip;
 
@@ -726,7 +714,7 @@ void TopBarWidget::updateControlsVisibility() {
 	const auto callsEnabled = [&] {
 		if (const auto peer = _activeChat.key.peer()) {
 			if (const auto user = peer->asUser()) {
-				return true;
+				return !user->isSelf() && !user->isBot();
 			}
 		}
 		return false;
@@ -734,11 +722,7 @@ void TopBarWidget::updateControlsVisibility() {
 	_call->setVisible(historyMode && callsEnabled);
 	const auto groupCallsEnabled = [&] {
 		if (const auto peer = _activeChat.key.peer()) {
-			if (const auto megagroup = peer->asMegagroup()) {
-				return megagroup->canManageCall();
-			} else if (const auto chat = peer->asChat()) {
-				return chat->amCreator();
-			}
+			return peer->canManageGroupCall();
 		}
 		return false;
 	}();

Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp

@@ -87,8 +87,8 @@ void Widget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(user());
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(user());
 	saveState(result.get());
 	return result;
 }

Telegram/SourceFiles/info/common_groups/info_common_groups_widget.h

@@ -64,7 +64,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	InnerWidget *_inner = nullptr;
 

Telegram/SourceFiles/info/feed/info_feed_channels.cpp

@@ -281,7 +281,7 @@ void Channels::showChannelsWithSearch(bool withSearch) {
 	auto mementoStack = std::vector<std::unique_ptr<ContentMemento>>();
 	mementoStack.push_back(std::move(contentMemento));
 	_controller->showSection(
-		Info::Memento(std::move(mementoStack)));
+		std::make_unique<Info::Memento>(std::move(mementoStack)));
 }
 
 void Channels::visibleTopBottomUpdated(

Telegram/SourceFiles/info/feed/info_feed_cover.cpp

@@ -84,7 +84,7 @@ void Cover::refreshStatusText() {
 	}();
 	_status->setRichText(textcmdLink(1, statusText));
 	_status->setLink(1, std::make_shared<LambdaClickHandler>([=] {
-		_controller->showSection(Info::Memento(
+		_controller->showSection(std::make_unique<Info::Memento>(
 			_feed,
 			Section::Type::Channels));
 	}));

Telegram/SourceFiles/info/info.style

@@ -748,7 +748,7 @@ topBarSearch: IconButton {
 		color: windowBgOver;
 	}
 }
-topBarSkip: -2px;
+topBarSkip: -5px;
 topBarCallSkip: -1px;
 topBarMenuToggle: IconButton(topBarSearch) {
 	width: 44px;
@@ -766,7 +766,7 @@ topBarCall: IconButton(topBarSearch) {
 topBarGroupCall: IconButton(topBarSearch) {
 	icon: icon {{ "top_bar_group_call", menuIconFg }};
 	iconOver: icon {{ "top_bar_group_call", menuIconFgOver }};
-	iconPosition: point(8px, 15px);
+	iconPosition: point(8px, 16px);
 }
 topBarInfo: IconButton(topBarSearch) {
 	icon: icon {{ "top_bar_profile", menuIconFg }};

Telegram/SourceFiles/info/info_content_widget.cpp

@@ -94,7 +94,7 @@ void ContentWidget::updateControlsGeometry() {
 	}
 }
 
-std::unique_ptr<ContentMemento> ContentWidget::createMemento() {
+std::shared_ptr<ContentMemento> ContentWidget::createMemento() {
 	auto result = doCreateMemento();
 	_controller->saveSearchState(result.get());
 	return result;

Telegram/SourceFiles/info/info_content_widget.h

@@ -39,7 +39,7 @@ public:
 
 	virtual bool showInternal(
 		not_null<ContentMemento*> memento) = 0;
-	std::unique_ptr<ContentMemento> createMemento();
+	std::shared_ptr<ContentMemento> createMemento();
 
 	virtual void setIsStackBottom(bool isStackBottom) {
 	}
@@ -96,7 +96,7 @@ private:
 	void updateControlsGeometry();
 	void refreshSearchField(bool shown);
 
-	virtual std::unique_ptr<ContentMemento> doCreateMemento() = 0;
+	virtual std::shared_ptr<ContentMemento> doCreateMemento() = 0;
 
 	const not_null<Controller*> _controller;
 

Telegram/SourceFiles/info/info_controller.cpp

@@ -123,7 +123,7 @@ PollData *AbstractController::poll() const {
 }
 
 void AbstractController::showSection(
-		Window::SectionMemento &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params) {
 	return parentController()->showSection(std::move(memento), params);
 }
@@ -170,7 +170,7 @@ void Controller::setupMigrationViewer() {
 		const auto section = _section;
 		InvokeQueued(_widget, [=] {
 			window->showSection(
-				Memento(peer, section),
+				std::make_shared<Memento>(peer, section),
 				Window::SectionShow(
 					Window::SectionShow::Way::Backward,
 					anim::type::instant,
@@ -261,9 +261,9 @@ void Controller::saveSearchState(not_null<ContentMemento*> memento) {
 }
 
 void Controller::showSection(
-		Window::SectionMemento &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params) {
-	if (!_widget->showInternal(&memento, params)) {
+	if (!_widget->showInternal(memento.get(), params)) {
 		AbstractController::showSection(std::move(memento), params);
 	}
 }

Telegram/SourceFiles/info/info_controller.h

@@ -136,7 +136,7 @@ public:
 	virtual rpl::producer<QString> mediaSourceQueryValue() const;
 
 	void showSection(
-		Window::SectionMemento &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params = Window::SectionShow()) override;
 	void showBackFromStack(
 		const Window::SectionShow &params = Window::SectionShow()) override;
@@ -202,7 +202,7 @@ public:
 	void saveSearchState(not_null<ContentMemento*> memento);
 
 	void showSection(
-		Window::SectionMemento &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params = Window::SectionShow()) override;
 	void showBackFromStack(
 		const Window::SectionShow &params = Window::SectionShow()) override;

Telegram/SourceFiles/info/info_layer_widget.cpp

@@ -106,7 +106,7 @@ void LayerWidget::parentResized() {
 		Ui::FocusPersister persister(this);
 		restoreFloatPlayerDelegate();
 
-		auto memento = MoveMemento(std::move(_content));
+		auto memento = std::make_shared<MoveMemento>(std::move(_content));
 
 		// We want to call hideSpecialLayer synchronously to avoid glitches,
 		// but we can't destroy LayerStackWidget from its' resizeEvent,

Telegram/SourceFiles/info/info_memento.cpp

@@ -47,41 +47,41 @@ Memento::Memento(not_null<PollData*> poll, FullMsgId contextId)
 : Memento(DefaultStack(poll, contextId)) {
 }
 
-Memento::Memento(std::vector<std::unique_ptr<ContentMemento>> stack)
+Memento::Memento(std::vector<std::shared_ptr<ContentMemento>> stack)
 : _stack(std::move(stack)) {
 }
 
-std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack(
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 		not_null<PeerData*> peer,
 		Section section) {
-	auto result = std::vector<std::unique_ptr<ContentMemento>>();
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
 	result.push_back(DefaultContent(peer, section));
 	return result;
 }
 
-//std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack( // #feed
+//std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack( // #feed
 //		not_null<Data::Feed*> feed,
 //		Section section) {
-//	auto result = std::vector<std::unique_ptr<ContentMemento>>();
+//	auto result = std::vector<std::shared_ptr<ContentMemento>>();
 //	result.push_back(DefaultContent(feed, section));
 //	return result;
 //}
 //
-std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack(
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 		Settings::Tag settings,
 		Section section) {
-	auto result = std::vector<std::unique_ptr<ContentMemento>>();
-	result.push_back(std::make_unique<Settings::Memento>(
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
+	result.push_back(std::make_shared<Settings::Memento>(
 		settings.self,
 		section.settingsType()));
 	return result;
 }
 
-std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack(
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 		not_null<PollData*> poll,
 		FullMsgId contextId) {
-	auto result = std::vector<std::unique_ptr<ContentMemento>>();
-	result.push_back(std::make_unique<Polls::Memento>(poll, contextId));
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
+	result.push_back(std::make_shared<Polls::Memento>(poll, contextId));
 	return result;
 }
 
@@ -101,8 +101,8 @@ Section Memento::DefaultSection(not_null<PeerData*> peer) {
 //	return Section(Section::Type::Profile);
 //}
 
-Memento Memento::Default(not_null<PeerData*> peer) {
-	return Memento(peer, DefaultSection(peer));
+std::shared_ptr<Memento> Memento::Default(not_null<PeerData*> peer) {
+	return std::make_shared<Memento>(peer, DefaultSection(peer));
 }
 // // #feed
 //Memento Memento::Default(Dialogs::Key key) {
@@ -112,7 +112,7 @@ Memento Memento::Default(not_null<PeerData*> peer) {
 //	return Memento(key.feed(), DefaultSection(key));
 //}
 
-std::unique_ptr<ContentMemento> Memento::DefaultContent(
+std::shared_ptr<ContentMemento> Memento::DefaultContent(
 		not_null<PeerData*> peer,
 		Section section) {
 	if (auto to = peer->migrateTo()) {
@@ -123,32 +123,32 @@ std::unique_ptr<ContentMemento> Memento::DefaultContent(
 
 	switch (section.type()) {
 	case Section::Type::Profile:
-		return std::make_unique<Profile::Memento>(
+		return std::make_shared<Profile::Memento>(
 			peer,
 			migratedPeerId);
 	case Section::Type::Media:
-		return std::make_unique<Media::Memento>(
+		return std::make_shared<Media::Memento>(
 			peer,
 			migratedPeerId,
 			section.mediaType());
 	case Section::Type::CommonGroups:
-		return std::make_unique<CommonGroups::Memento>(peer->asUser());
+		return std::make_shared<CommonGroups::Memento>(peer->asUser());
 	case Section::Type::Members:
-		return std::make_unique<Members::Memento>(
+		return std::make_shared<Members::Memento>(
 			peer,
 			migratedPeerId);
 	}
 	Unexpected("Wrong section type in Info::Memento::DefaultContent()");
 }
 //
-//std::unique_ptr<ContentMemento> Memento::DefaultContent( // #feed
+//std::shared_ptr<ContentMemento> Memento::DefaultContent( // #feed
 //		not_null<Data::Feed*> feed,
 //		Section section) {
 //	switch (section.type()) {
 //	case Section::Type::Profile:
-//		return std::make_unique<FeedProfile::Memento>(feed);
+//		return std::make_shared<FeedProfile::Memento>(feed);
 //	case Section::Type::Channels:
-//		return std::make_unique<Channels::Memento>(feed);
+//		return std::make_shared<Channels::Memento>(feed);
 //	}
 //	Unexpected("Wrong feed section in Info::Memento::DefaultContent()");
 //}
@@ -179,7 +179,7 @@ object_ptr<Ui::LayerWidget> Memento::createLayer(
 	return nullptr;
 }
 
-std::vector<std::unique_ptr<ContentMemento>> Memento::takeStack() {
+std::vector<std::shared_ptr<ContentMemento>> Memento::takeStack() {
 	return std::move(_stack);
 }
 

Telegram/SourceFiles/info/info_memento.h

@@ -37,7 +37,7 @@ public:
 	//Memento(not_null<Data::Feed*> feed, Section section); // #feed
 	Memento(Settings::Tag settings, Section section);
 	Memento(not_null<PollData*> poll, FullMsgId contextId);
-	explicit Memento(std::vector<std::unique_ptr<ContentMemento>> stack);
+	explicit Memento(std::vector<std::shared_ptr<ContentMemento>> stack);
 
 	object_ptr<Window::SectionWidget> createWidget(
 		QWidget *parent,
@@ -52,7 +52,7 @@ public:
 	int stackSize() const {
 		return int(_stack.size());
 	}
-	std::vector<std::unique_ptr<ContentMemento>> takeStack();
+	std::vector<std::shared_ptr<ContentMemento>> takeStack();
 
 	not_null<ContentMemento*> content() {
 		Expects(!_stack.empty());
@@ -62,33 +62,33 @@ public:
 
 	static Section DefaultSection(not_null<PeerData*> peer);
 	//static Section DefaultSection(Dialogs::Key key); // #feed
-	static Memento Default(not_null<PeerData*> peer);
+	static std::shared_ptr<Memento> Default(not_null<PeerData*> peer);
 	//static Memento Default(Dialogs::Key key); // #feed
 
 	~Memento();
 
 private:
-	static std::vector<std::unique_ptr<ContentMemento>> DefaultStack(
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		not_null<PeerData*> peer,
 		Section section);
-	//static std::vector<std::unique_ptr<ContentMemento>> DefaultStack( // #feed
+	//static std::vector<std::shared_ptr<ContentMemento>> DefaultStack( // #feed
 	//	not_null<Data::Feed*> feed,
 	//	Section section);
-	static std::vector<std::unique_ptr<ContentMemento>> DefaultStack(
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		Settings::Tag settings,
 		Section section);
-	static std::vector<std::unique_ptr<ContentMemento>> DefaultStack(
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		not_null<PollData*> poll,
 		FullMsgId contextId);
 
-	//static std::unique_ptr<ContentMemento> DefaultContent( // #feed
+	//static std::shared_ptr<ContentMemento> DefaultContent( // #feed
 	//	not_null<Data::Feed*> feed,
 	//	Section section);
-	static std::unique_ptr<ContentMemento> DefaultContent(
+	static std::shared_ptr<ContentMemento> DefaultContent(
 		not_null<PeerData*> peer,
 		Section section);
 
-	std::vector<std::unique_ptr<ContentMemento>> _stack;
+	std::vector<std::shared_ptr<ContentMemento>> _stack;
 
 };
 

Telegram/SourceFiles/info/info_section_widget.cpp

@@ -92,7 +92,7 @@ bool SectionWidget::showInternal(
 	return _content->showInternal(memento, params);
 }
 
-std::unique_ptr<Window::SectionMemento> SectionWidget::createMemento() {
+std::shared_ptr<Window::SectionMemento> SectionWidget::createMemento() {
 	return _content->createMemento();
 }
 

Telegram/SourceFiles/info/info_section_widget.h

@@ -48,7 +48,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	object_ptr<Ui::LayerWidget> moveContentToLayer(
 		QRect bodyGeometry) override;

Telegram/SourceFiles/info/info_wrap_widget.cpp

@@ -50,8 +50,8 @@ const style::InfoTopBar &TopBarStyle(Wrap wrap) {
 } // namespace
 
 struct WrapWidget::StackItem {
-	std::unique_ptr<ContentMemento> section;
-//	std::unique_ptr<ContentMemento> anotherTab;
+	std::shared_ptr<ContentMemento> section;
+//	std::shared_ptr<ContentMemento> anotherTab;
 };
 
 WrapWidget::WrapWidget(
@@ -96,7 +96,7 @@ void WrapWidget::setupShortcuts() {
 }
 
 void WrapWidget::restoreHistoryStack(
-		std::vector<std::unique_ptr<ContentMemento>> stack) {
+		std::vector<std::shared_ptr<ContentMemento>> stack) {
 	Expects(!stack.empty());
 	Expects(!hasStackHistory());
 
@@ -188,7 +188,7 @@ void WrapWidget::injectActivePeerProfile(not_null<PeerData*> peer) {
 //}
 
 void WrapWidget::injectActiveProfileMemento(
-		std::unique_ptr<ContentMemento> memento) {
+		std::shared_ptr<ContentMemento> memento) {
 	auto injected = StackItem();
 	injected.section = std::move(memento);
 	_historyStack.insert(
@@ -712,13 +712,13 @@ rpl::producer<SelectedItems> WrapWidget::selectedListValue() const {
 
 // Was done for top level tabs support.
 //
-//std::unique_ptr<ContentMemento> WrapWidget::createTabMemento(
+//std::shared_ptr<ContentMemento> WrapWidget::createTabMemento(
 //		Tab tab) {
 //	switch (tab) {
-//	case Tab::Profile: return std::make_unique<Profile::Memento>(
+//	case Tab::Profile: return std::make_shared<Profile::Memento>(
 //		_controller->peerId(),
 //		_controller->migratedPeerId());
-//	case Tab::Media: return std::make_unique<Media::Memento>(
+//	case Tab::Media: return std::make_shared<Media::Memento>(
 //		_controller->peerId(),
 //		_controller->migratedPeerId(),
 //		Media::Type::Photo);
@@ -884,8 +884,8 @@ void WrapWidget::highlightTopBar() {
 	}
 }
 
-std::unique_ptr<Window::SectionMemento> WrapWidget::createMemento() {
-	auto stack = std::vector<std::unique_ptr<ContentMemento>>();
+std::shared_ptr<Window::SectionMemento> WrapWidget::createMemento() {
+	auto stack = std::vector<std::shared_ptr<ContentMemento>>();
 	stack.reserve(_historyStack.size() + 1);
 	for (auto &stackItem : base::take(_historyStack)) {
 		stack.push_back(std::move(stackItem.section));
@@ -895,7 +895,7 @@ std::unique_ptr<Window::SectionMemento> WrapWidget::createMemento() {
 	// We're not in valid state anymore and supposed to be destroyed.
 	_controller = nullptr;
 
-	return std::make_unique<Memento>(std::move(stack));
+	return std::make_shared<Memento>(std::move(stack));
 }
 
 rpl::producer<int> WrapWidget::desiredHeightValue() const {

Telegram/SourceFiles/info/info_wrap_widget.h

@@ -101,7 +101,7 @@ public:
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
 	bool showBackFromStackInternal(const Window::SectionShow &params);
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	rpl::producer<int> desiredHeightValue() const override;
 
@@ -146,10 +146,10 @@ private:
 	void injectActivePeerProfile(not_null<PeerData*> peer);
 	//void injectActiveFeedProfile(not_null<Data::Feed*> feed); // #feed
 	void injectActiveProfileMemento(
-		std::unique_ptr<ContentMemento> memento);
+		std::shared_ptr<ContentMemento> memento);
 	void checkBeforeClose(Fn<void()> close);
 	void restoreHistoryStack(
-		std::vector<std::unique_ptr<ContentMemento>> stack);
+		std::vector<std::shared_ptr<ContentMemento>> stack);
 	bool hasStackHistory() const {
 		return !_historyStack.empty();
 	}
@@ -178,7 +178,7 @@ private:
 
 	//void showTab(Tab tab);
 	void showContent(object_ptr<ContentWidget> content);
-	//std::unique_ptr<ContentMemento> createTabMemento(Tab tab);
+	//std::shared_ptr<ContentMemento> createTabMemento(Tab tab);
 	object_ptr<ContentWidget> createContent(
 		not_null<ContentMemento*> memento,
 		not_null<Controller*> controller);
@@ -212,7 +212,7 @@ private:
 	base::unique_qptr<Ui::DropdownMenu> _topBarMenu;
 
 //	Tab _tab = Tab::Profile;
-//	std::unique_ptr<ContentMemento> _anotherTabMemento;
+//	std::shared_ptr<ContentMemento> _anotherTabMemento;
 	std::vector<StackItem> _historyStack;
 
 	rpl::event_stream<rpl::producer<int>> _desiredHeights;

Telegram/SourceFiles/info/media/info_media_buttons.h

@@ -92,7 +92,7 @@ inline auto AddButton(
 		tracker)->entity();
 	result->addClickHandler([=] {
 		navigation->showSection(
-			Info::Memento(peer, Section(type)));
+			std::make_shared<Info::Memento>(peer, Section(type)));
 	});
 	return result;
 };
@@ -111,7 +111,7 @@ inline auto AddCommonGroupsButton(
 		tracker)->entity();
 	result->addClickHandler([=] {
 		navigation->showSection(
-			Info::Memento(user, Section::Type::CommonGroups));
+			std::make_shared<Info::Memento>(user, Section::Type::CommonGroups));
 	});
 	return result;
 };

Telegram/SourceFiles/info/media/info_media_widget.cpp

@@ -115,8 +115,8 @@ void Widget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(controller());
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
 	saveState(result.get());
 	return result;
 }

Telegram/SourceFiles/info/media/info_media_widget.h

@@ -103,7 +103,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	InnerWidget *_inner = nullptr;