From 4d8ac05d2891f23f13dd7a3356d910874ca9cbe5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Mar 2021 14:05:02 +0400
Subject: [PATCH] Improve mute/raise_hand saving.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 34 +++++++++++--------
 Telegram/SourceFiles/calls/calls_group_call.h |  6 +++-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index c471e90607..6b81d1ce37 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -188,7 +188,8 @@ GroupCall::GroupCall(
 		if (_instance) {
 			updateInstanceMuteState();
 		}
-		if (_mySsrc && !_initialMuteStateSent) {
+		if (_mySsrc
+			&& (!_initialMuteStateSent || state == MuteState::Active)) {
 			_initialMuteStateSent = true;
 			maybeSendMutedUpdate(previous);
 		}
@@ -648,7 +649,10 @@ void GroupCall::setMuted(MuteState mute) {
 
 void GroupCall::setMutedAndUpdate(MuteState mute) {
 	const auto was = muted();
-	const auto send = _initialMuteStateSent;
+
+	// Active state is sent from _muted changes,
+	// because it may be set delayed, after permissions request, not now.
+	const auto send = _initialMuteStateSent && (mute != MuteState::Active);
 	setMuted(mute);
 	if (send) {
 		maybeSendMutedUpdate(was);
@@ -1238,28 +1242,30 @@ void GroupCall::setInstanceMode(InstanceMode mode) {
 }
 
 void GroupCall::maybeSendMutedUpdate(MuteState previous) {
-	// Send only Active <-> !Active changes.
+	// Send Active <-> !Active or ForceMuted <-> RaisedHand changes.
 	const auto now = muted();
-	const auto wasActive = (previous == MuteState::Active);
-	const auto nowActive = (now == MuteState::Active);
-	if ((wasActive && now == MuteState::Muted)
-		|| (nowActive
+	if ((previous == MuteState::Active && now == MuteState::Muted)
+		|| (now == MuteState::Active
 			&& (previous == MuteState::Muted
-				|| previous == MuteState::PushToTalk))
-		|| (now == MuteState::ForceMuted
-			&& previous == MuteState::RaisedHand)
+				|| previous == MuteState::PushToTalk))) {
+		sendSelfUpdate(SendUpdateType::Mute);
+	} else if ((now == MuteState::ForceMuted
+		&& previous == MuteState::RaisedHand)
 		|| (now == MuteState::RaisedHand
 			&& previous == MuteState::ForceMuted)) {
-		sendMutedUpdate();
+		sendSelfUpdate(SendUpdateType::RaiseHand);
 	}
 }
 
-void GroupCall::sendMutedUpdate() {
+void GroupCall::sendSelfUpdate(SendUpdateType type) {
 	_api.request(_updateMuteRequestId).cancel();
 	using Flag = MTPphone_EditGroupCallParticipant::Flag;
 	_updateMuteRequestId = _api.request(MTPphone_EditGroupCallParticipant(
-		MTP_flags(((muted() != MuteState::Active) ? Flag::f_muted : Flag(0))
-			| Flag::f_raise_hand),
+		MTP_flags((type == SendUpdateType::RaiseHand)
+			? Flag::f_raise_hand
+			: (muted() != MuteState::Active)
+			? Flag::f_muted
+			: Flag(0)),
 		inputCall(),
 		_joinAs->input,
 		MTP_int(100000), // volume
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 5141f77b40..536bda7b54 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -202,6 +202,10 @@ private:
 		Rtc,
 		Stream,
 	};
+	enum class SendUpdateType {
+		Mute,
+		RaiseHand,
+	};
 
 	void handleRequestError(const RPCError &error);
 	void handleControllerError(const QString &error);
@@ -211,7 +215,7 @@ private:
 	void setState(State state);
 	void finish(FinishType type);
 	void maybeSendMutedUpdate(MuteState previous);
-	void sendMutedUpdate();
+	void sendSelfUpdate(SendUpdateType type);
 	void updateInstanceMuteState();
 	void updateInstanceVolumes();
 	void applyMeInCallLocally();