Combine JoinChannel queries.

This commit is contained in:
levlam 2024-01-10 17:42:14 +03:00
parent faee94b680
commit 44eba3d214
2 changed files with 30 additions and 3 deletions

View File

@ -1504,10 +1504,17 @@ void DialogParticipantManager::add_channel_participant(ChannelId channel_id, Use
return promise.set_error(Status::Error(400, "Can't return to kicked from chat"));
}
if (!td_->contacts_manager_->get_channel_join_request(channel_id)) {
speculative_add_channel_user(channel_id, user_id, DialogParticipantStatus::Member(), my_status);
auto &queries = join_channel_queries_[channel_id];
queries.push_back(std::move(promise));
if (queries.size() == 1u) {
if (!td_->contacts_manager_->get_channel_join_request(channel_id)) {
speculative_add_channel_user(channel_id, user_id, DialogParticipantStatus::Member(), my_status);
}
auto query_promise = PromiseCreator::lambda([actor_id = actor_id(this), channel_id](Result<Unit> result) {
send_closure(actor_id, &DialogParticipantManager::on_join_channel, channel_id, std::move(result));
});
td_->create_handler<JoinChannelQuery>(std::move(query_promise))->send(channel_id);
}
td_->create_handler<JoinChannelQuery>(std::move(promise))->send(channel_id);
return;
}
@ -1521,6 +1528,22 @@ void DialogParticipantManager::add_channel_participant(ChannelId channel_id, Use
td_->create_handler<InviteToChannelQuery>(std::move(promise))->send(channel_id, {user_id}, std::move(input_users));
}
void DialogParticipantManager::on_join_channel(ChannelId channel_id, Result<Unit> &&result) {
G()->ignore_result_if_closing(result);
auto it = join_channel_queries_.find(channel_id);
CHECK(it != join_channel_queries_.end());
auto promises = std::move(it->second);
CHECK(!promises.empty());
join_channel_queries_.erase(it);
if (result.is_ok()) {
set_promises(promises);
} else {
fail_promises(promises, result.move_as_error());
}
}
void DialogParticipantManager::add_channel_participants(ChannelId channel_id, const vector<UserId> &user_ids,
Promise<Unit> &&promise) {
if (td_->auth_manager_->is_bot()) {

View File

@ -164,6 +164,8 @@ class DialogParticipantManager final : public Actor {
void add_channel_participant(ChannelId channel_id, UserId user_id, const DialogParticipantStatus &old_status,
Promise<Unit> &&promise);
void on_join_channel(ChannelId channel_id, Result<Unit> &&result);
void add_channel_participants(ChannelId channel_id, const vector<UserId> &user_ids, Promise<Unit> &&promise);
void set_channel_participant_status(ChannelId channel_id, DialogId participant_dialog_id,
@ -214,6 +216,8 @@ class DialogParticipantManager final : public Actor {
};
FlatHashMap<ChannelId, ChannelParticipants, ChannelIdHash> channel_participants_;
FlatHashMap<ChannelId, vector<Promise<Unit>>, ChannelIdHash> join_channel_queries_;
MultiTimeout update_dialog_online_member_count_timeout_{"UpdateDialogOnlineMemberCountTimeout"};
MultiTimeout channel_participant_cache_timeout_{"ChannelParticipantCacheTimeout"};