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

Simplify get_group_call_participant usage.

Browse Source
This commit is contained in:
levlam 2021-02-15 18:18:34 +03:00
parent 5f54e72444
commit aa2f645d74
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
td/telegram/GroupCallManager.cpp
View File

@ -976,6 +976,11 @@ GroupCallManager::GroupCallParticipants *GroupCallManager::add_group_call_partic
return participants.get(); return participants.get();
} }
GroupCallParticipant *GroupCallManager::get_group_call_participant(InputGroupCallId input_group_call_id,
UserId user_id) {
return get_group_call_participant(add_group_call_participants(input_group_call_id), user_id);
}
GroupCallParticipant *GroupCallManager::get_group_call_participant(GroupCallParticipants *group_call_participants, GroupCallParticipant *GroupCallManager::get_group_call_participant(GroupCallParticipants *group_call_participants,
UserId user_id) { UserId user_id) {
for (auto &group_call_participant : group_call_participants->participants) { for (auto &group_call_participant : group_call_participants->participants) {
@ -1965,7 +1970,7 @@ void GroupCallManager::on_toggle_group_call_participant_is_muted(InputGroupCallI
return promise.set_value(Unit()); return promise.set_value(Unit());
} }
auto participant = get_group_call_participant(add_group_call_participants(input_group_call_id), user_id); auto participant = get_group_call_participant(input_group_call_id, user_id);
if (participant == nullptr || participant->pending_is_muted_generation != generation) { if (participant == nullptr || participant->pending_is_muted_generation != generation) {
return promise.set_value(Unit()); return promise.set_value(Unit());
} }
@ -2002,7 +2007,7 @@ void GroupCallManager::set_group_call_participant_volume_level(GroupCallId group
return promise.set_error(Status::Error(400, "Can't change self volume level")); return promise.set_error(Status::Error(400, "Can't change self volume level"));
} }
auto participant = get_group_call_participant(add_group_call_participants(input_group_call_id), user_id); auto participant = get_group_call_participant(input_group_call_id, user_id);
if (participant == nullptr) { if (participant == nullptr) {
return promise.set_error(Status::Error(400, "Can't find group call participant")); return promise.set_error(Status::Error(400, "Can't find group call participant"));
} }
@ -2041,7 +2046,7 @@ void GroupCallManager::on_set_group_call_participant_volume_level(InputGroupCall
return promise.set_value(Unit()); return promise.set_value(Unit());
} }
auto participant = get_group_call_participant(add_group_call_participants(input_group_call_id), user_id); auto participant = get_group_call_participant(input_group_call_id, user_id);
if (participant == nullptr || participant->pending_volume_level_generation != generation) { if (participant == nullptr || participant->pending_volume_level_generation != generation) {
return promise.set_value(Unit()); return promise.set_value(Unit());
} }
@ -2394,7 +2399,7 @@ void GroupCallManager::on_user_speaking_in_group_call(GroupCallId group_call_id,
if (!td_->contacts_manager_->have_user_force(user_id) || if (!td_->contacts_manager_->have_user_force(user_id) ||
(!recursive && need_group_call_participants(input_group_call_id, group_call) && (!recursive && need_group_call_participants(input_group_call_id, group_call) &&
get_group_call_participant(add_group_call_participants(input_group_call_id), user_id) == nullptr)) { get_group_call_participant(input_group_call_id, user_id) == nullptr)) {
if (recursive) { if (recursive) {
LOG(ERROR) << "Failed to find speaking " << user_id << " from " << input_group_call_id; LOG(ERROR) << "Failed to find speaking " << user_id << " from " << input_group_call_id;
} else { } else {

2
td/telegram/GroupCallManager.h
View File

@ -173,6 +173,8 @@ class GroupCallManager : public Actor {
GroupCallParticipants *add_group_call_participants(InputGroupCallId input_group_call_id); GroupCallParticipants *add_group_call_participants(InputGroupCallId input_group_call_id);
GroupCallParticipant *get_group_call_participant(InputGroupCallId input_group_call_id, UserId user_id);
static GroupCallParticipant *get_group_call_participant(GroupCallParticipants *group_call_participants, static GroupCallParticipant *get_group_call_participant(GroupCallParticipants *group_call_participants,
UserId user_id); UserId user_id);