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

Keep active date while adjusting min-order.

Browse Source
This commit is contained in:
levlam 2021-03-19 00:03:34 +03:00
parent 504ecbeed7
commit 35250a91bd
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
td/telegram/GroupCallManager.cpp
View File

@ -1383,9 +1383,6 @@ void GroupCallManager::on_update_group_call_participants(
LOG(ERROR) << "Receive invalid " << to_string(group_call_participant); LOG(ERROR) << "Receive invalid " << to_string(group_call_participant);
continue; continue;
} }
if (participant.dialog_id.get_type() != DialogType::User) {
td_->messages_manager_->force_create_dialog(participant.dialog_id, "on_update_group_call_participants 1");
}
if (participant.joined_date == 0) { if (participant.joined_date == 0) {
diff--; diff--;
remove_recent_group_call_speaker(input_group_call_id, participant.dialog_id); remove_recent_group_call_speaker(input_group_call_id, participant.dialog_id);
@ -1631,7 +1628,7 @@ void GroupCallManager::on_sync_group_call_participants_failed(InputGroupCallId i
GroupCallParticipantOrder GroupCallManager::get_real_participant_order( GroupCallParticipantOrder GroupCallManager::get_real_participant_order(
bool can_manage, const GroupCallParticipant &participant, const GroupCallParticipants *participants) const { bool can_manage, const GroupCallParticipant &participant, const GroupCallParticipants *participants) const {
auto real_order = participant.get_real_order(can_manage, participants->joined_date_asc); auto real_order = participant.get_real_order(can_manage, participants->joined_date_asc, false);
if (real_order >= participants->min_order) { if (real_order >= participants->min_order) {
return real_order; return real_order;
} }
@ -1695,7 +1692,7 @@ void GroupCallManager::process_group_call_participants(
td_->messages_manager_->force_create_dialog(participant.dialog_id, "process_group_call_participants"); td_->messages_manager_->force_create_dialog(participant.dialog_id, "process_group_call_participants");
} }
auto real_order = participant.get_real_order(can_manage, joined_date_asc); auto real_order = participant.get_real_order(can_manage, joined_date_asc, true);
if (real_order > min_order) { if (real_order > min_order) {
LOG(ERROR) << "Receive call participant with order " << real_order << " after call participant with order " LOG(ERROR) << "Receive call participant with order " << real_order << " after call participant with order "
<< min_order; << min_order;
@ -3488,7 +3485,7 @@ void GroupCallManager::on_participant_speaking_in_group_call(InputGroupCallId in
return; return;
} }
on_user_speaking_in_group_call(group_call->group_call_id, participant.dialog_id, active_date, true); on_user_speaking_in_group_call(group_call->group_call_id, participant.dialog_id, active_date, !participant.is_min);
} }
void GroupCallManager::on_user_speaking_in_group_call(GroupCallId group_call_id, DialogId dialog_id, int32 date, void GroupCallManager::on_user_speaking_in_group_call(GroupCallId group_call_id, DialogId dialog_id, int32 date,

5
td/telegram/GroupCallParticipant.cpp
View File

@ -58,9 +58,10 @@ bool GroupCallParticipant::is_versioned_update(const tl_object_ptr<telegram_api:
return participant->just_joined_ || participant->left_ || participant->versioned_; return participant->just_joined_ || participant->left_ || participant->versioned_;
} }
GroupCallParticipantOrder GroupCallParticipant::get_real_order(bool can_manage, bool joined_date_asc) const { GroupCallParticipantOrder GroupCallParticipant::get_real_order(bool can_manage, bool joined_date_asc,
bool keep_active_date) const {
auto sort_active_date = td::max(active_date, local_active_date); auto sort_active_date = td::max(active_date, local_active_date);
if (sort_active_date < G()->unix_time() - 300) { if (!keep_active_date && sort_active_date < G()->unix_time() - 300) {
sort_active_date = 0; sort_active_date = 0;
} }
auto sort_raise_hand_rating = can_manage ? raise_hand_rating : 0; auto sort_raise_hand_rating = can_manage ? raise_hand_rating : 0;

2
td/telegram/GroupCallParticipant.h
View File

@ -72,7 +72,7 @@ struct GroupCallParticipant {
bool set_pending_is_muted(bool is_muted, bool can_manage, bool is_admin); bool set_pending_is_muted(bool is_muted, bool can_manage, bool is_admin);
GroupCallParticipantOrder get_real_order(bool can_manage, bool joined_date_asc) const; GroupCallParticipantOrder get_real_order(bool can_manage, bool joined_date_asc, bool keep_active_date) const;
bool is_valid() const { bool is_valid() const {
return dialog_id.is_valid(); return dialog_id.is_valid();