tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sending of updateGroupCallParticipant in some rare cases.

Browse Source
This commit is contained in:
levlam 2021-05-07 02:10:37 +03:00
parent b342ec33e5
commit 7dbee21918
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
td/telegram/GroupCallManager.cpp
View File

@ -1863,7 +1863,7 @@ void GroupCallManager::process_group_call_participants(
} }
auto min_order = GroupCallParticipantOrder::max(); auto min_order = GroupCallParticipantOrder::max();
DialogId min_order_dialog_id; DialogId debug_min_order_dialog_id;
bool can_self_unmute = get_group_call_can_self_unmute(input_group_call_id); bool can_self_unmute = get_group_call_can_self_unmute(input_group_call_id);
bool joined_date_asc = get_group_call_joined_date_asc(input_group_call_id); bool joined_date_asc = get_group_call_joined_date_asc(input_group_call_id);
for (auto &group_call_participant : participants) { for (auto &group_call_participant : participants) {
@ -1883,11 +1883,11 @@ void GroupCallManager::process_group_call_participants(
if (is_load) { if (is_load) {
auto real_order = participant.get_real_order(can_self_unmute, joined_date_asc, true); auto real_order = participant.get_real_order(can_self_unmute, joined_date_asc, true);
if (real_order > min_order) { if (real_order > min_order) {
LOG(ERROR) << "Receive call participant " << participant.dialog_id << " with order " << real_order LOG(ERROR) << "Receive group call participant " << participant.dialog_id << " with order " << real_order
<< " after call participant " << min_order_dialog_id << " with order " << min_order; << " after group call participant " << debug_min_order_dialog_id << " with order " << min_order;
} else { } else {
min_order = real_order; min_order = real_order;
min_order_dialog_id = participant.dialog_id; debug_min_order_dialog_id = participant.dialog_id;
} }
} }
if (is_sync) { if (is_sync) {
@ -1895,6 +1895,13 @@ void GroupCallManager::process_group_call_participants(
} }
process_group_call_participant(input_group_call_id, std::move(participant)); process_group_call_participant(input_group_call_id, std::move(participant));
} }
if (is_load && participants.empty() && !joined_date_asc) {
// If loaded 0 participants and new participants are added to the beginning of the list,
// then the end of the list was reached.
// Set min_order to the minimum possible value to send updates about all participants with order less than
// the current min_order. There can be such participants if the last loaded participant had a fake active_date.
min_order = GroupCallParticipantOrder::min();
}
if (is_sync) { if (is_sync) {
auto participants_it = group_call_participants_.find(input_group_call_id); auto participants_it = group_call_participants_.find(input_group_call_id);
if (participants_it != group_call_participants_.end()) { if (participants_it != group_call_participants_.end()) {
@ -1903,6 +1910,7 @@ void GroupCallManager::process_group_call_participants(
for (auto participant_it = group_participants.begin(); participant_it != group_participants.end();) { for (auto participant_it = group_participants.begin(); participant_it != group_participants.end();) {
auto &participant = *participant_it; auto &participant = *participant_it;
if (old_participant_dialog_ids.count(participant.dialog_id) == 0) { if (old_participant_dialog_ids.count(participant.dialog_id) == 0) {
// successfully synced old user
++participant_it; ++participant_it;
continue; continue;
} }

4
td/telegram/GroupCallParticipantOrder.cpp
View File

@ -14,6 +14,10 @@
namespace td { namespace td {
GroupCallParticipantOrder GroupCallParticipantOrder::min() {
return GroupCallParticipantOrder(0, 0, 1);
}
GroupCallParticipantOrder GroupCallParticipantOrder::max() { GroupCallParticipantOrder GroupCallParticipantOrder::max() {
return GroupCallParticipantOrder(std::numeric_limits<int32>::max(), std::numeric_limits<int64>::max(), return GroupCallParticipantOrder(std::numeric_limits<int32>::max(), std::numeric_limits<int64>::max(),
std::numeric_limits<int32>::max()); std::numeric_limits<int32>::max());

2
td/telegram/GroupCallParticipantOrder.h
View File

@ -30,6 +30,8 @@ class GroupCallParticipantOrder {
: active_date(active_date), joined_date(joined_date), raise_hand_rating(raise_hand_rating) { : active_date(active_date), joined_date(joined_date), raise_hand_rating(raise_hand_rating) {
} }
static GroupCallParticipantOrder min();
static GroupCallParticipantOrder max(); static GroupCallParticipantOrder max();
bool is_valid() const; bool is_valid() const;