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

Add groupCall.is_joined flag.

Browse Source
This commit is contained in:
levlam 2020-12-06 14:33:15 +03:00
parent 1c5db9f809
commit 82a2d9262c
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
td/generate/scheme/td_api.tl
View File

@ -2065,12 +2065,13 @@ callStateError error:error = CallState;
//@description Describes a group call
//@id Group call identifier
//@is_active True, if the call is active
//@is_joined True, if the call is joined
//@member_count Number of members in the group call
//@recent_speaker_user_ids Identifiers of recently speaking users in the group call
//@mute_new_members True, if only group call administrators can unmute new members
//@allowed_change_mute_new_members True, if group call administrators can enable or disable mute_new_members setting
//@duration Call duration; for ended calls only
groupCall id:int32 is_active:Bool member_count:int32 recent_speaker_user_ids:vector<int32> mute_new_members:Bool allowed_change_mute_new_members:Bool duration:int32 = GroupCall;
groupCall id:int32 is_active:Bool is_joined:Bool member_count:int32 recent_speaker_user_ids:vector<int32> mute_new_members:Bool allowed_change_mute_new_members:Bool duration:int32 = GroupCall;
//@description Describes a payload fingerprint for interaction with tgcalls @hash Value of the field hash @setup Value of the field setup @fingerprint Value of the field fingerprint
groupCallPayloadFingerprint hash:string setup:string fingerprint:string = GroupCallPayloadFingerprint;
@ -4352,7 +4353,7 @@ setGroupCallMemberIsSpeaking group_call_id:int32 source:int32 is_speaking:Bool =
//@group_call_id Group call identifier @user_id User identifier @is_muted Pass true if the user must be muted and false otherwise
toggleGroupCallMemberIsMuted group_call_id:int32 user_id:int32 is_muted:Bool = Ok;
//@description Checks whether a group call is still joined. Should be called after connection with the server has been lost. Returns an error with a message "GROUP_CALL_JOIN_MISSING" for non-joined calls @group_call_id Group call identifier
//@description Checks whether a group call is still joined. Should be called every 10 seconds when tgcalls notifies about lost connection with the server @group_call_id Group call identifier
checkGroupCallIsJoined group_call_id:int32 = Ok;
//@description Leaves a group call @group_call_id Group call identifier

BIN
td/generate/scheme/td_api.tlo
View File

Binary file not shown.

20
td/telegram/GroupCallManager.cpp
View File

@ -670,14 +670,15 @@ Result<td_api::object_ptr<td_api::groupCallJoinResponse>> GroupCallManager::get_
return td_api::make_object<td_api::groupCallJoinResponse>(std::move(payload), std::move(candidates_object));
}
void GroupCallManager::on_join_group_call_response(InputGroupCallId input_group_call_id, string json_response) {
bool GroupCallManager::on_join_group_call_response(InputGroupCallId input_group_call_id, string json_response) {
auto it = pending_join_requests_.find(input_group_call_id);
if (it == pending_join_requests_.end()) {
return;
return false;
}
CHECK(it->second != nullptr);
auto result = get_group_call_join_response_object(std::move(json_response));
bool need_update = false;
if (result.is_error()) {
LOG(ERROR) << "Failed to parse join response JSON object: " << result.error().message();
it->second->promise.set_error(Status::Error(500, "Receive invalid join group call response payload"));
@ -687,8 +688,10 @@ void GroupCallManager::on_join_group_call_response(InputGroupCallId input_group_
group_call->is_joined = true;
group_call->source = it->second->source;
it->second->promise.set_value(result.move_as_ok());
need_update = true;
}
pending_join_requests_.erase(it);
return need_update;
}
void GroupCallManager::finish_join_group_call(InputGroupCallId input_group_call_id, uint64 generation, Status error) {
@ -781,15 +784,19 @@ void GroupCallManager::check_group_call_is_joined(GroupCallId group_call_id, Pro
TRY_RESULT_PROMISE(promise, input_group_call_id, get_input_group_call_id(group_call_id));
auto *group_call = get_group_call(input_group_call_id);
if (group_call == nullptr || !group_call->is_inited || !group_call->is_active || !group_call->is_joined) {
if (group_call == nullptr || !group_call->is_inited) {
return promise.set_error(Status::Error(400, "GROUP_CALL_JOIN_MISSING"));
}
if (!group_call->is_active || !group_call->is_joined) {
return promise.set_value(Unit());
}
auto source = group_call->source;
auto query_promise = PromiseCreator::lambda([actor_id = actor_id(this), input_group_call_id, source,
promise = std::move(promise)](Result<Unit> &&result) mutable {
if (result.is_error() && result.error().message() == "GROUP_CALL_JOIN_MISSING") {
send_closure(actor_id, &GroupCallManager::on_group_call_left, input_group_call_id, source);
result = Unit();
}
promise.set_result(std::move(result));
});
@ -822,6 +829,7 @@ void GroupCallManager::on_group_call_left(InputGroupCallId input_group_call_id,
group_call->is_joined = false;
group_call->is_speaking = false;
group_call->source = 0;
send_closure(G()->td(), &Td::send_update, get_update_group_call_object(group_call));
}
}
@ -927,7 +935,7 @@ InputGroupCallId GroupCallManager::update_group_call(const tl_object_ptr<telegra
group_call->channel_id = channel_id;
}
if (!join_params.empty()) {
on_join_group_call_response(call_id, std::move(join_params));
need_update |= on_join_group_call_response(call_id, std::move(join_params));
}
if (need_update) {
send_closure(G()->td(), &Td::send_update, get_update_group_call_object(group_call));
@ -1003,8 +1011,8 @@ tl_object_ptr<td_api::groupCall> GroupCallManager::get_group_call_object(const G
}
return td_api::make_object<td_api::groupCall>(group_call->group_call_id.get(), group_call->is_active,
group_call->member_count, std::move(recent_speaker_user_ids),
group_call->mute_new_members,
group_call->is_joined, group_call->member_count,
std::move(recent_speaker_user_ids), group_call->mute_new_members,
group_call->allowed_change_mute_new_members, group_call->duration);
}

2
td/telegram/GroupCallManager.h
View File

@ -92,7 +92,7 @@ class GroupCallManager : public Actor {
void finish_get_group_call(InputGroupCallId input_group_call_id,
Result<tl_object_ptr<telegram_api::phone_groupCall>> &&result);
void 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);