Queue skipped self updates in voice chats.

Telegram/SourceFiles/calls/calls_group_call.cpp

@@ -548,6 +548,7 @@ void GroupCall::rejoin(not_null<PeerData*> as) {
 				applyMeInCallLocally();
 				maybeSendMutedUpdate(wasMuteState);
 				_peer->session().api().applyUpdates(updates);
+				applyQueuedSelfUpdates();
 				checkFirstTimeJoined();
 			}).fail([=](const MTP::Error &error) {
 				const auto type = error.type();
@@ -991,41 +992,39 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 		return;
 	}
 	const auto state = _state.current();
-	if (state != State::Joined && state != State::Connecting) {
+	const auto joined = (state == State::Joined)
-		return;
+		|| (state == State::Connecting);
-	}
-
-	const auto handleOtherParticipants = [=](
-			const MTPDgroupCallParticipant &data) {
-		if (data.is_min()) {
-			// No real information about mutedByMe or my custom volume.
-			return;
-		}
-		const auto participantPeer = _peer->owner().peer(
-			peerFromMTP(data.vpeer()));
-		const auto participant = LookupParticipant(
-			_peer,
-			_id,
-			participantPeer);
-		if (!participant) {
-			return;
-		}
-		_otherParticipantStateValue.fire(Group::ParticipantState{
-			.peer = participantPeer,
-			.volume = data.vvolume().value_or_empty(),
-			.mutedByMe = data.is_muted_by_you(),
-		});
-	};
-
 	for (const auto &participant : data.vparticipants().v) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
 			const auto isSelf = data.is_self()
 				|| (data.is_min()
 					&& peerFromMTP(data.vpeer()) == _joinAs->id);
 			if (!isSelf) {
-				handleOtherParticipants(data);
+				applyOtherParticipantUpdate(data);
-				return;
+			} else if (joined) {
+				applySelfUpdate(data);
+			} else {
+				_queuedSelfUpdates.push_back(participant);
 			}
+		});
+	}
+}
+
+void GroupCall::applyQueuedSelfUpdates() {
+	const auto weak = base::make_weak(this);
+	while (weak
+		&& !_queuedSelfUpdates.empty()
+		&& (_state.current() == State::Joined
+			|| _state.current() == State::Connecting)) {
+		const auto update = _queuedSelfUpdates.front();
+		_queuedSelfUpdates.erase(_queuedSelfUpdates.begin());
+		update.match([&](const MTPDgroupCallParticipant &data) {
+			applySelfUpdate(data);
+		});
+	}
+}
+
+void GroupCall::applySelfUpdate(const MTPDgroupCallParticipant &data) {
 	if (data.is_left()) {
 		if (data.vsource().v == _mySsrc) {
 			// I was removed from the call, rejoin.
@@ -1069,8 +1068,24 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 	} else if (data.is_muted() && muted() != MuteState::Muted) {
 		setMuted(MuteState::Muted);
 	}
-		});
 }
+
+void GroupCall::applyOtherParticipantUpdate(
+		const MTPDgroupCallParticipant &data) {
+	if (data.is_min()) {
+		// No real information about mutedByMe or my custom volume.
+		return;
+	}
+	const auto participantPeer = _peer->owner().peer(
+		peerFromMTP(data.vpeer()));
+	if (!LookupParticipant(_peer, _id, participantPeer)) {
+		return;
+	}
+	_otherParticipantStateValue.fire(Group::ParticipantState{
+		.peer = participantPeer,
+		.volume = data.vvolume().value_or_empty(),
+		.mutedByMe = data.is_muted_by_you(),
+	});
 }
 
 void GroupCall::changeTitle(const QString &title) {

Telegram/SourceFiles/calls/calls_group_call.h

@@ -290,6 +290,9 @@ private:
 		not_null<PeerData*> participantPeer,
 		bool mute,
 		std::optional<int> volume);
+	void applyQueuedSelfUpdates();
+	void applySelfUpdate(const MTPDgroupCallParticipant &data);
+	void applyOtherParticipantUpdate(const MTPDgroupCallParticipant &data);
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
@@ -321,6 +324,7 @@ private:
 	bool _acceptFields = false;
 
 	rpl::event_stream<Group::ParticipantState> _otherParticipantStateValue;
+	std::vector<MTPGroupCallParticipant> _queuedSelfUpdates;
 
 	uint64 _id = 0;
 	uint64 _accessHash = 0;