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

Create all dialogs before initializing inactive_channel_ids_.

Browse Source
This commit is contained in:
levlam 2022-09-21 18:55:21 +03:00
parent 831f0bead3
commit 6c91b9aa6b
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
td/telegram/ContactsManager.cpp
View File

@ -2588,11 +2588,9 @@ class GetInactiveChannelsQuery final : public Td::ResultHandler {
auto result = result_ptr.move_as_ok(); auto result = result_ptr.move_as_ok();
LOG(INFO) << "Receive result for GetInactiveChannelsQuery: " << to_string(result); LOG(INFO) << "Receive result for GetInactiveChannelsQuery: " << to_string(result);
// TODO use result->dates_ // don't need to use result->dates_, because chat.last_message.date is more reliable
td_->contacts_manager_->on_get_users(std::move(result->users_), "GetInactiveChannelsQuery"); td_->contacts_manager_->on_get_users(std::move(result->users_), "GetInactiveChannelsQuery");
td_->contacts_manager_->on_get_inactive_channels(std::move(result->chats_)); td_->contacts_manager_->on_get_inactive_channels(std::move(result->chats_), std::move(promise_));
promise_.set_value(Unit());
} }
void on_error(Status status) final { void on_error(Status status) final {
@ -8305,26 +8303,42 @@ void ContactsManager::update_dialogs_for_discussion(DialogId dialog_id, bool is_
} }
vector<DialogId> ContactsManager::get_inactive_channels(Promise<Unit> &&promise) { vector<DialogId> ContactsManager::get_inactive_channels(Promise<Unit> &&promise) {
if (inactive_channels_inited_) { if (inactive_channel_ids_inited_) {
promise.set_value(Unit()); promise.set_value(Unit());
return transform(inactive_channels_, [&](ChannelId channel_id) { return transform(inactive_channel_ids_, [&](ChannelId channel_id) { return DialogId(channel_id); });
DialogId dialog_id{channel_id};
td_->messages_manager_->force_create_dialog(dialog_id, "get_inactive_channels");
return dialog_id;
});
} }
td_->create_handler<GetInactiveChannelsQuery>(std::move(promise))->send(); td_->create_handler<GetInactiveChannelsQuery>(std::move(promise))->send();
return {}; return {};
} }
void ContactsManager::on_get_inactive_channels(vector<tl_object_ptr<telegram_api::Chat>> &&chats) { void ContactsManager::on_get_inactive_channels(vector<tl_object_ptr<telegram_api::Chat>> &&chats,
inactive_channels_inited_ = true; Promise<Unit> &&promise) {
inactive_channels_ = get_channel_ids(std::move(chats), "on_get_inactive_channels"); auto channel_ids = get_channel_ids(std::move(chats), "on_get_inactive_channels");
MultiPromiseActorSafe mpas{"GetInactiveChannelsMultiPromiseActor"};
mpas.add_promise(PromiseCreator::lambda([actor_id = actor_id(this), channel_ids,
promise = std::move(promise)](Unit) mutable {
send_closure(actor_id, &ContactsManager::on_create_inactive_channels, std::move(channel_ids), std::move(promise));
}));
mpas.set_ignore_errors(true);
auto lock_promise = mpas.get_promise();
for (auto channel_id : channel_ids) {
td_->messages_manager_->create_dialog(DialogId(channel_id), false, mpas.get_promise());
}
lock_promise.set_value(Unit());
}
void ContactsManager::on_create_inactive_channels(vector<ChannelId> &&channel_ids, Promise<Unit> &&promise) {
inactive_channel_ids_inited_ = true;
inactive_channel_ids_ = std::move(channel_ids);
promise.set_value(Unit());
} }
void ContactsManager::remove_inactive_channel(ChannelId channel_id) { void ContactsManager::remove_inactive_channel(ChannelId channel_id) {
if (inactive_channels_inited_ && td::remove(inactive_channels_, channel_id)) { if (inactive_channel_ids_inited_ && td::remove(inactive_channel_ids_, channel_id)) {
LOG(DEBUG) << "Remove " << channel_id << " from list of inactive channels"; LOG(DEBUG) << "Remove " << channel_id << " from list of inactive channels";
} }
} }

8
td/telegram/ContactsManager.h
View File

@ -252,7 +252,7 @@ class ContactsManager final : public Actor {
void on_get_dialogs_for_discussion(vector<tl_object_ptr<telegram_api::Chat>> &&chats); void on_get_dialogs_for_discussion(vector<tl_object_ptr<telegram_api::Chat>> &&chats);
void on_get_inactive_channels(vector<tl_object_ptr<telegram_api::Chat>> &&chats); void on_get_inactive_channels(vector<tl_object_ptr<telegram_api::Chat>> &&chats, Promise<Unit> &&promise);
void remove_inactive_channel(ChannelId channel_id); void remove_inactive_channel(ChannelId channel_id);
@ -1608,6 +1608,8 @@ class ContactsManager final : public Actor {
vector<DialogId> get_dialog_ids(vector<tl_object_ptr<telegram_api::Chat>> &&chats, const char *source); vector<DialogId> get_dialog_ids(vector<tl_object_ptr<telegram_api::Chat>> &&chats, const char *source);
void on_create_inactive_channels(vector<ChannelId> &&channel_ids, Promise<Unit> &&promise);
void update_dialogs_for_discussion(DialogId dialog_id, bool is_suitable); void update_dialogs_for_discussion(DialogId dialog_id, bool is_suitable);
void send_edit_chat_admin_query(ChatId chat_id, UserId user_id, bool is_administrator, Promise<Unit> &&promise); void send_edit_chat_admin_query(ChatId chat_id, UserId user_id, bool is_administrator, Promise<Unit> &&promise);
@ -1757,8 +1759,8 @@ class ContactsManager final : public Actor {
bool dialogs_for_discussion_inited_ = false; bool dialogs_for_discussion_inited_ = false;
vector<DialogId> dialogs_for_discussion_; vector<DialogId> dialogs_for_discussion_;
bool inactive_channels_inited_ = false; bool inactive_channel_ids_inited_ = false;
vector<ChannelId> inactive_channels_; vector<ChannelId> inactive_channel_ids_;
FlatHashMap<UserId, vector<Promise<Unit>>, UserIdHash> load_user_from_database_queries_; FlatHashMap<UserId, vector<Promise<Unit>>, UserIdHash> load_user_from_database_queries_;
FlatHashSet<UserId, UserIdHash> loaded_from_database_users_; FlatHashSet<UserId, UserIdHash> loaded_from_database_users_;