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

Add cancel_join_group_call_request function.

Browse Source
This commit is contained in:
levlam 2021-02-10 18:09:42 +03:00
parent 7ef5772861
commit 9554a42cd3
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
td/telegram/GroupCallManager.cpp
View File

@ -1429,6 +1429,21 @@ int GroupCallManager::process_group_call_participant(InputGroupCallId input_grou
return diff; return diff;
} }
bool GroupCallManager::cancel_join_group_call_request(InputGroupCallId input_group_call_id) {
auto it = pending_join_requests_.find(input_group_call_id);
if (it == pending_join_requests_.end()) {
return false;
}
CHECK(it->second != nullptr);
if (!it->second->query_ref.empty()) {
cancel_query(it->second->query_ref);
}
it->second->promise.set_error(Status::Error(200, "Cancelled"));
pending_join_requests_.erase(it);
return true;
}
void GroupCallManager::join_group_call(GroupCallId group_call_id, void GroupCallManager::join_group_call(GroupCallId group_call_id,
td_api::object_ptr<td_api::groupCallPayload> &&payload, int32 audio_source, td_api::object_ptr<td_api::groupCallPayload> &&payload, int32 audio_source,
bool is_muted, bool is_muted,
@ -1450,16 +1465,7 @@ void GroupCallManager::join_group_call(GroupCallId group_call_id,
} }
group_call->is_being_left = false; group_call->is_being_left = false;
if (pending_join_requests_.count(input_group_call_id)) { cancel_join_group_call_request(input_group_call_id);
auto it = pending_join_requests_.find(input_group_call_id);
CHECK(it != pending_join_requests_.end());
CHECK(it->second != nullptr);
if (!it->second->query_ref.empty()) {
cancel_query(it->second->query_ref);
}
it->second->promise.set_error(Status::Error(200, "Cancelled by another joinGroupCall request"));
pending_join_requests_.erase(it);
}
if (payload == nullptr) { if (payload == nullptr) {
return promise.set_error(Status::Error(400, "Payload must be non-empty")); return promise.set_error(Status::Error(400, "Payload must be non-empty"));
@ -1941,7 +1947,7 @@ void GroupCallManager::leave_group_call(GroupCallId group_call_id, Promise<Unit>
group_call->need_rejoin = false; group_call->need_rejoin = false;
send_update_group_call(group_call, "leave_group_call"); send_update_group_call(group_call, "leave_group_call");
try_clear_group_call_participants(input_group_call_id); try_clear_group_call_participants(input_group_call_id);
promise.set_value(Unit()); return promise.set_value(Unit());
} }
return promise.set_error(Status::Error(400, "GROUPCALL_JOIN_MISSING")); return promise.set_error(Status::Error(400, "GROUPCALL_JOIN_MISSING"));
} }

2
td/telegram/GroupCallManager.h
View File

@ -163,6 +163,8 @@ class GroupCallManager : public Actor {
void finish_load_group_call_administrators(InputGroupCallId input_group_call_id, Result<DialogParticipants> &&result); void finish_load_group_call_administrators(InputGroupCallId input_group_call_id, Result<DialogParticipants> &&result);
bool cancel_join_group_call_request(InputGroupCallId input_group_call_id);
bool on_join_group_call_response(InputGroupCallId input_group_call_id, string json_response); bool on_join_group_call_response(InputGroupCallId input_group_call_id, string json_response);
void finish_join_group_call(InputGroupCallId input_group_call_id, uint64 generation, Status error); void finish_join_group_call(InputGroupCallId input_group_call_id, uint64 generation, Status error);