Fix joining a voice chat.

Telegram/SourceFiles/calls/calls_group_call.cpp

@@ -713,8 +713,16 @@ void GroupCall::setMutedAndUpdate(MuteState mute) {
 	}
 }
 
-void GroupCall::handleUpdate(const MTPGroupCall &call) {
+void GroupCall::handlePossibleCreateOrJoinResponse(
-	return call.match([&](const MTPDgroupCall &data) {
+		const MTPDupdateGroupCall &data) {
+	data.vcall().match([&](const MTPDgroupCall &data) {
+		handlePossibleCreateOrJoinResponse(data);
+	}, [](const MTPDgroupCallDiscarded &data) {
+	});
+}
+
+void GroupCall::handlePossibleCreateOrJoinResponse(
+		const MTPDgroupCall &data) {
 	if (_acceptFields) {
 		if (!_instance && !_id) {
 			join(MTP_inputGroupCall(data.vid(), data.vaccess_hash()));
@@ -727,7 +735,10 @@ void GroupCall::handleUpdate(const MTPGroupCall &call) {
 	}
 	const auto streamDcId = MTP::BareDcId(
 		data.vstream_dc_id().value_or_empty());
-		if (const auto params = data.vparams()) {
+	const auto params = data.vparams();
+	if (!params) {
+		return;
+	}
 	params->match([&](const MTPDdataJSON &data) {
 		auto error = QJsonParseError{ 0, QJsonParseError::NoError };
 		const auto document = QJsonDocument::fromJson(
@@ -799,13 +810,6 @@ void GroupCall::handleUpdate(const MTPGroupCall &call) {
 		setInstanceMode(InstanceMode::Rtc);
 		_instance->setJoinResponsePayload(payload, {});
 	});
-		}
-	}, [&](const MTPDgroupCallDiscarded &data) {
-		if (data.vid().v == _id) {
-			_mySsrc = 0;
-			hangup();
-		}
-	});
 }
 
 void GroupCall::addParticipantsToInstance() {
@@ -849,7 +853,33 @@ void GroupCall::addPreparedParticipantsDelayed() {
 	crl::on_main(this, [=] { addPreparedParticipants(); });
 }
 
+void GroupCall::handleUpdate(const MTPUpdate &update) {
+	update.match([&](const MTPDupdateGroupCall &data) {
+		handleUpdate(data);
+	}, [&](const MTPDupdateGroupCallParticipants &data) {
+		handleUpdate(data);
+	}, [](const auto &) {
+		Unexpected("Type in Instance::applyGroupCallUpdateChecked.");
+	});
+}
+
+void GroupCall::handleUpdate(const MTPDupdateGroupCall &data) {
+	data.vcall().match([](const MTPDgroupCall &) {
+	}, [&](const MTPDgroupCallDiscarded &data) {
+		if (data.vid().v == _id) {
+			_mySsrc = 0;
+			hangup();
+		}
+	});
+}
+
 void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
+	const auto callId = data.vcall().match([](const auto &data) {
+		return data.vid().v;
+	});
+	if (_id != callId) {
+		return;
+	}
 	const auto state = _state.current();
 	if (state != State::Joined && state != State::Connecting) {
 		return;

Telegram/SourceFiles/calls/calls_group_call.h

@@ -116,8 +116,8 @@ public:
 	void rejoinAs(Group::JoinInfo info);
 	void rejoinWithHash(const QString &hash);
 	void join(const MTPInputGroupCall &inputCall);
-	void handleUpdate(const MTPGroupCall &call);
+	void handleUpdate(const MTPUpdate &update);
-	void handleUpdate(const MTPDupdateGroupCallParticipants &data);
+	void handlePossibleCreateOrJoinResponse(const MTPDupdateGroupCall &data);
 	void changeTitle(const QString &title);
 	void toggleRecording(bool enabled, const QString &title);
 	[[nodiscard]] bool recordingStoppedByMe() const {
@@ -227,6 +227,9 @@ private:
 		RaiseHand,
 	};
 
+	void handlePossibleCreateOrJoinResponse(const MTPDgroupCall &data);
+	void handleUpdate(const MTPDupdateGroupCall &data);
+	void handleUpdate(const MTPDupdateGroupCallParticipants &data);
 	void handleRequestError(const MTP::Error &error);
 	void handleControllerError(const QString &error);
 	void ensureControllerCreated();

Telegram/SourceFiles/calls/calls_instance.cpp

@@ -427,28 +427,23 @@ void Instance::handleGroupCallUpdate(
 	} else {
 		applyGroupCallUpdateChecked(session, update);
 	}
+
+	if (_currentGroupCall
+		&& (&_currentGroupCall->peer()->session() == session)) {
+		update.match([&](const MTPDupdateGroupCall &data) {
+			_currentGroupCall->handlePossibleCreateOrJoinResponse(data);
+		}, [](const auto &) {
+		});
+	}
 }
 
 void Instance::applyGroupCallUpdateChecked(
 		not_null<Main::Session*> session,
 		const MTPUpdate &update) {
-	if (!_currentGroupCall
+	if (_currentGroupCall
-		|| (&_currentGroupCall->peer()->session() != session)) {
+		&& (&_currentGroupCall->peer()->session() == session)) {
-		return;
+		_currentGroupCall->handleUpdate(update);
 	}
-
-	update.match([&](const MTPDupdateGroupCall &data) {
-		_currentGroupCall->handleUpdate(data.vcall());
-	}, [&](const MTPDupdateGroupCallParticipants &data) {
-		const auto callId = data.vcall().match([](const auto &data) {
-			return data.vid().v;
-		});
-		if (_currentGroupCall->id() == callId) {
-			_currentGroupCall->handleUpdate(data);
-		}
-	}, [](const auto &) {
-		Unexpected("Type in Instance::applyGroupCallUpdateChecked.");
-	});
 }
 
 void Instance::handleSignalingData(

Telegram/SourceFiles/data/data_group_call.h

@@ -137,7 +137,7 @@ private:
 	mtpRequestId _reloadRequestId = 0;
 	rpl::variable<QString> _title;
 
-	base::flat_map<std::pair<int,bool>, MTPUpdate> _queuedUpdates;
+	base::flat_multi_map<std::pair<int,bool>, MTPUpdate> _queuedUpdates;
 	base::Timer _reloadByQueuedUpdatesTimer;
 
 	std::vector<Participant> _participants;