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

Use reload_dialog_info_full instead of get_dialog_info_full to guarantee that the data will be reloaded.

Browse Source
This commit is contained in:
levlam 2022-01-19 14:37:07 +03:00
parent 99586edf26
commit 06a67030a0
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/GroupCallManager.cpp
View File

@ -2758,7 +2758,7 @@ void GroupCallManager::finish_join_group_call(InputGroupCallId input_group_call_
if (group_call != nullptr && group_call->dialog_id.is_valid()) { if (group_call != nullptr && group_call->dialog_id.is_valid()) {
update_group_call_dialog(group_call, "finish_join_group_call", false); update_group_call_dialog(group_call, "finish_join_group_call", false);
td_->messages_manager_->reload_dialog_info_full(group_call->dialog_id); td_->messages_manager_->reload_dialog_info_full(group_call->dialog_id, "finish_join_group_call");
} }
} }

36
td/telegram/MessagesManager.cpp
View File

@ -3910,7 +3910,7 @@ class ForwardMessagesActor final : public NetActorOnce {
td_->contacts_manager_->reload_dialog_info(from_dialog_id_, Promise<Unit>()); td_->contacts_manager_->reload_dialog_info(from_dialog_id_, Promise<Unit>());
} }
if (status.code() == 400 && status.message() == CSlice("SEND_AS_PEER_INVALID")) { if (status.code() == 400 && status.message() == CSlice("SEND_AS_PEER_INVALID")) {
td_->messages_manager_->reload_dialog_info_full(to_dialog_id_); td_->messages_manager_->reload_dialog_info_full(to_dialog_id_, "SEND_AS_PEER_INVALID");
} }
for (auto &random_id : random_ids_) { for (auto &random_id : random_ids_) {
td_->messages_manager_->on_send_message_fail(random_id, status.clone()); td_->messages_manager_->on_send_message_fail(random_id, status.clone());
@ -8360,7 +8360,7 @@ void MessagesManager::do_repair_dialog_active_group_call_id(DialogId dialog_id)
return; return;
} }
reload_dialog_info_full(dialog_id); reload_dialog_info_full(dialog_id, "do_repair_dialog_active_group_call_id");
} }
class MessagesManager::ToggleDialogReportSpamStateOnServerLogEvent { class MessagesManager::ToggleDialogReportSpamStateOnServerLogEvent {
@ -14902,21 +14902,21 @@ void MessagesManager::on_get_dialogs(FolderId folder_id, vector<tl_object_ptr<te
if (!d->is_is_blocked_inited && !td_->auth_manager_->is_bot()) { if (!d->is_is_blocked_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get is_blocked from the server // asynchronously get is_blocked from the server
// TODO add is_blocked to telegram_api::dialog // TODO add is_blocked to telegram_api::dialog
get_dialog_info_full(dialog_id, Auto(), "on_get_dialogs init is_blocked"); reload_dialog_info_full(dialog_id, "on_get_dialogs init is_blocked");
} else if (!d->is_has_bots_inited && !td_->auth_manager_->is_bot()) { } else if (!d->is_has_bots_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get has_bots from the server // asynchronously get has_bots from the server
// TODO add has_bots to telegram_api::dialog // TODO add has_bots to telegram_api::dialog
get_dialog_info_full(dialog_id, Auto(), "on_get_dialogs init has_bots"); reload_dialog_info_full(dialog_id, "on_get_dialogs init has_bots");
} else if (!d->is_theme_name_inited && !td_->auth_manager_->is_bot()) { } else if (!d->is_theme_name_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get theme_name from the server // asynchronously get theme_name from the server
// TODO add theme_name to telegram_api::dialog // TODO add theme_name to telegram_api::dialog
get_dialog_info_full(dialog_id, Auto(), "on_get_dialogs init theme_name"); reload_dialog_info_full(dialog_id, "on_get_dialogs init theme_name");
} else if (!d->is_last_pinned_message_id_inited && !td_->auth_manager_->is_bot()) { } else if (!d->is_last_pinned_message_id_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get dialog pinned message from the server // asynchronously get dialog pinned message from the server
get_dialog_pinned_message(dialog_id, Auto()); get_dialog_pinned_message(dialog_id, Auto());
} else if (!d->is_available_reactions_inited && !td_->auth_manager_->is_bot()) { } else if (!d->is_available_reactions_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get dialog available reactions from the server // asynchronously get dialog available reactions from the server
get_dialog_info_full(dialog_id, Auto(), "on_get_dialogs init available_reactions"); reload_dialog_info_full(dialog_id, "on_get_dialogs init available_reactions");
} }
need_update_dialog_pos |= update_dialog_draft_message( need_update_dialog_pos |= update_dialog_draft_message(
@ -17761,11 +17761,12 @@ void MessagesManager::get_dialog_info_full(DialogId dialog_id, Promise<Unit> &&p
} }
} }
void MessagesManager::reload_dialog_info_full(DialogId dialog_id) { void MessagesManager::reload_dialog_info_full(DialogId dialog_id, const char *source) {
if (G()->close_flag()) { if (G()->close_flag()) {
return; return;
} }
LOG(INFO) << "Reload full info about " << dialog_id << " from " << source;
switch (dialog_id.get_type()) { switch (dialog_id.get_type()) {
case DialogType::User: case DialogType::User:
send_closure_later(td_->contacts_manager_actor_, &ContactsManager::reload_user_full, dialog_id.get_user_id()); send_closure_later(td_->contacts_manager_actor_, &ContactsManager::reload_user_full, dialog_id.get_user_id());
@ -17776,7 +17777,7 @@ void MessagesManager::reload_dialog_info_full(DialogId dialog_id) {
return; return;
case DialogType::Channel: case DialogType::Channel:
send_closure_later(td_->contacts_manager_actor_, &ContactsManager::reload_channel_full, send_closure_later(td_->contacts_manager_actor_, &ContactsManager::reload_channel_full,
dialog_id.get_channel_id(), Promise<Unit>(), "reload_dialog_info_full"); dialog_id.get_channel_id(), Promise<Unit>(), source);
return; return;
case DialogType::SecretChat: case DialogType::SecretChat:
return; return;
@ -17790,7 +17791,7 @@ void MessagesManager::reload_dialog_info_full(DialogId dialog_id) {
void MessagesManager::on_dialog_info_full_invalidated(DialogId dialog_id) { void MessagesManager::on_dialog_info_full_invalidated(DialogId dialog_id) {
Dialog *d = get_dialog(dialog_id); Dialog *d = get_dialog(dialog_id);
if (d != nullptr && d->is_opened) { if (d != nullptr && d->is_opened) {
reload_dialog_info_full(dialog_id); reload_dialog_info_full(dialog_id, "on_dialog_info_full_invalidated");
} }
} }
@ -28079,7 +28080,7 @@ bool MessagesManager::on_get_dialog_error(DialogId dialog_id, const Status &stat
return true; return true;
} }
if (status.message() == CSlice("SEND_AS_PEER_INVALID")) { if (status.message() == CSlice("SEND_AS_PEER_INVALID")) {
reload_dialog_info_full(dialog_id); reload_dialog_info_full(dialog_id, "SEND_AS_PEER_INVALID");
return true; return true;
} }
@ -30794,7 +30795,8 @@ void MessagesManager::drop_dialog_last_pinned_message_id(Dialog *d) {
create_actor<SleepActor>( create_actor<SleepActor>(
"ReloadDialogFullInfoActor", 1.0, "ReloadDialogFullInfoActor", 1.0,
PromiseCreator::lambda([actor_id = actor_id(this), dialog_id = d->dialog_id](Result<Unit> result) { PromiseCreator::lambda([actor_id = actor_id(this), dialog_id = d->dialog_id](Result<Unit> result) {
send_closure(actor_id, &MessagesManager::reload_dialog_info_full, dialog_id); send_closure(actor_id, &MessagesManager::reload_dialog_info_full, dialog_id,
"drop_dialog_last_pinned_message_id");
})) }))
.release(); .release();
} }
@ -35255,13 +35257,13 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
if (being_added_dialog_id_ != dialog_id && !d->is_is_blocked_inited && !td_->auth_manager_->is_bot()) { if (being_added_dialog_id_ != dialog_id && !d->is_is_blocked_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get is_blocked from the server // asynchronously get is_blocked from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init is_blocked"); reload_dialog_info_full(dialog_id, "fix_new_dialog init is_blocked");
} else if (being_added_dialog_id_ != dialog_id && !d->is_has_bots_inited && !td_->auth_manager_->is_bot()) { } else if (being_added_dialog_id_ != dialog_id && !d->is_has_bots_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get has_bots from the server // asynchronously get has_bots from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init has_bots"); reload_dialog_info_full(dialog_id, "fix_new_dialog init has_bots");
} else if (being_added_dialog_id_ != dialog_id && !d->is_theme_name_inited && !td_->auth_manager_->is_bot()) { } else if (being_added_dialog_id_ != dialog_id && !d->is_theme_name_inited && !td_->auth_manager_->is_bot()) {
// asynchronously get dialog theme identifier from the server // asynchronously get dialog theme identifier from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init theme_name"); reload_dialog_info_full(dialog_id, "fix_new_dialog init theme_name");
} else if (being_added_dialog_id_ != dialog_id && !d->is_last_pinned_message_id_inited && } else if (being_added_dialog_id_ != dialog_id && !d->is_last_pinned_message_id_inited &&
!td_->auth_manager_->is_bot()) { !td_->auth_manager_->is_bot()) {
// asynchronously get dialog pinned message from the server // asynchronously get dialog pinned message from the server
@ -35269,15 +35271,15 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
} else if (being_added_dialog_id_ != dialog_id && !d->is_folder_id_inited && !td_->auth_manager_->is_bot() && } else if (being_added_dialog_id_ != dialog_id && !d->is_folder_id_inited && !td_->auth_manager_->is_bot() &&
order != DEFAULT_ORDER) { order != DEFAULT_ORDER) {
// asynchronously get dialog folder identifier from the server // asynchronously get dialog folder identifier from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init folder_id"); reload_dialog_info_full(dialog_id, "fix_new_dialog init folder_id");
} else if (!d->is_message_ttl_inited && !td_->auth_manager_->is_bot() && } else if (!d->is_message_ttl_inited && !td_->auth_manager_->is_bot() &&
have_input_peer(dialog_id, AccessRights::Write)) { have_input_peer(dialog_id, AccessRights::Write)) {
// asynchronously get dialog message TTL from the server // asynchronously get dialog message TTL from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init message_ttl"); reload_dialog_info_full(dialog_id, "fix_new_dialog init message_ttl");
} else if (being_added_dialog_id_ != dialog_id && !d->is_available_reactions_inited && } else if (being_added_dialog_id_ != dialog_id && !d->is_available_reactions_inited &&
!td_->auth_manager_->is_bot()) { !td_->auth_manager_->is_bot()) {
// asynchronously get dialog available reactions from the server // asynchronously get dialog available reactions from the server
get_dialog_info_full(dialog_id, Auto(), "fix_new_dialog init available_reactions"); reload_dialog_info_full(dialog_id, "fix_new_dialog init available_reactions");
} }
if ((!d->know_action_bar || d->need_repair_action_bar) && !td_->auth_manager_->is_bot() && if ((!d->know_action_bar || d->need_repair_action_bar) && !td_->auth_manager_->is_bot() &&
dialog_type != DialogType::SecretChat && dialog_id != get_my_dialog_id() && dialog_type != DialogType::SecretChat && dialog_id != get_my_dialog_id() &&

2
td/telegram/MessagesManager.h
View File

@ -528,7 +528,7 @@ class MessagesManager final : public Actor {
bool have_dialog_info(DialogId dialog_id) const; bool have_dialog_info(DialogId dialog_id) const;
bool have_dialog_info_force(DialogId dialog_id) const; bool have_dialog_info_force(DialogId dialog_id) const;
void reload_dialog_info_full(DialogId dialog_id); void reload_dialog_info_full(DialogId dialog_id, const char *source);
void on_dialog_info_full_invalidated(DialogId dialog_id); void on_dialog_info_full_invalidated(DialogId dialog_id);