andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Add source to get_channel_full.

Browse Source 
GitOrigin-RevId: 4df2ac6b75f92359bf838226f707742764e92209
This commit is contained in:
levlam 2019-12-20 17:17:06 +03:00
parent 7beb6d99d4
commit c093afbf68
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
td/telegram/ContactsManager.cpp
View File

@ -5098,7 +5098,7 @@ void ContactsManager::set_channel_username(ChannelId channel_id, const string &u
} }
if (!username.empty() && c->username.empty()) { if (!username.empty() && c->username.empty()) {
auto channel_full = get_channel_full(channel_id); auto channel_full = get_channel_full(channel_id, "set_channel_username");
if (channel_full != nullptr && !channel_full->can_set_username) { if (channel_full != nullptr && !channel_full->can_set_username) {
return promise.set_error(Status::Error(3, "Can't set supergroup username")); return promise.set_error(Status::Error(3, "Can't set supergroup username"));
} }
@ -5130,7 +5130,7 @@ void ContactsManager::set_channel_sticker_set(ChannelId channel_id, StickerSetId
} }
} }
auto channel_full = get_channel_full(channel_id); auto channel_full = get_channel_full(channel_id, "set_channel_sticker_set");
if (channel_full != nullptr && !channel_full->can_set_sticker_set) { if (channel_full != nullptr && !channel_full->can_set_sticker_set) {
return promise.set_error(Status::Error(3, "Can't set supergroup sticker set")); return promise.set_error(Status::Error(3, "Can't set supergroup sticker set"));
} }
@ -5827,7 +5827,7 @@ string ContactsManager::get_chat_invite_link(ChatId chat_id) const {
string ContactsManager::get_channel_invite_link( string ContactsManager::get_channel_invite_link(
ChannelId channel_id) { // should be non-const to update ChannelFull cache ChannelId channel_id) { // should be non-const to update ChannelFull cache
auto channel_full = get_channel_full(channel_id); auto channel_full = get_channel_full(channel_id, "get_channel_invite_link");
if (channel_full == nullptr) { if (channel_full == nullptr) {
auto it = channel_invite_links_.find(channel_id); auto it = channel_invite_links_.find(channel_id);
return it == channel_invite_links_.end() ? string() : it->second; return it == channel_invite_links_.end() ? string() : it->second;
@ -7758,7 +7758,7 @@ void ContactsManager::on_load_channel_full_from_database(ChannelId channel_id, s
// G()->td_db()->get_sqlite_pmc()->erase(get_channel_full_database_key(channel_id), Auto()); // G()->td_db()->get_sqlite_pmc()->erase(get_channel_full_database_key(channel_id), Auto());
// return; // return;
if (get_channel_full(channel_id) != nullptr || value.empty()) { if (get_channel_full(channel_id, "on_load_channel_full_from_database") != nullptr || value.empty()) {
return; return;
} }
@ -7793,7 +7793,7 @@ ContactsManager::ChannelFull *ContactsManager::get_channel_full_force(ChannelId
return nullptr; return nullptr;
} }
ChannelFull *channel_full = get_channel_full(channel_id); ChannelFull *channel_full = get_channel_full(channel_id, "get_channel_full_force");
if (channel_full != nullptr) { if (channel_full != nullptr) {
return channel_full; return channel_full;
} }
@ -7807,7 +7807,7 @@ ContactsManager::ChannelFull *ContactsManager::get_channel_full_force(ChannelId
LOG(INFO) << "Trying to load full " << channel_id << " from database"; LOG(INFO) << "Trying to load full " << channel_id << " from database";
on_load_channel_full_from_database( on_load_channel_full_from_database(
channel_id, G()->td_db()->get_sqlite_sync_pmc()->get(get_channel_full_database_key(channel_id))); channel_id, G()->td_db()->get_sqlite_sync_pmc()->get(get_channel_full_database_key(channel_id)));
return get_channel_full(channel_id); return get_channel_full(channel_id, "get_channel_full_force");
} }
void ContactsManager::for_each_secret_chat_with_user(UserId user_id, std::function<void(SecretChatId)> f) { void ContactsManager::for_each_secret_chat_with_user(UserId user_id, std::function<void(SecretChatId)> f) {
@ -8540,7 +8540,7 @@ void ContactsManager::on_get_chat_full(tl_object_ptr<telegram_api::ChatFull> &&c
} }
if (!G()->close_flag()) { if (!G()->close_flag()) {
auto channel = get_channel_full(channel_id); auto channel = get_channel_full(channel_id, "on_get_channel_full");
if (channel != nullptr) { if (channel != nullptr) {
if (channel->repair_request_version != 0 && channel->repair_request_version < channel->speculative_version) { if (channel->repair_request_version != 0 && channel->repair_request_version < channel->speculative_version) {
LOG(INFO) << "Receive ChannelFull with request version " << channel->repair_request_version LOG(INFO) << "Receive ChannelFull with request version " << channel->repair_request_version
@ -11650,7 +11650,7 @@ const ContactsManager::ChannelFull *ContactsManager::get_channel_full(ChannelId
} }
} }
ContactsManager::ChannelFull *ContactsManager::get_channel_full(ChannelId channel_id) { ContactsManager::ChannelFull *ContactsManager::get_channel_full(ChannelId channel_id, const char *source) {
auto p = channels_full_.find(channel_id); auto p = channels_full_.find(channel_id);
if (p == channels_full_.end()) { if (p == channels_full_.end()) {
return nullptr; return nullptr;
@ -11660,8 +11660,7 @@ ContactsManager::ChannelFull *ContactsManager::get_channel_full(ChannelId channe
if (channel_full->is_expired() && !td_->auth_manager_->is_bot()) { if (channel_full->is_expired() && !td_->auth_manager_->is_bot()) {
auto input_channel = get_input_channel(channel_id); auto input_channel = get_input_channel(channel_id);
CHECK(input_channel != nullptr); CHECK(input_channel != nullptr);
send_get_channel_full_query(channel_full, channel_id, std::move(input_channel), Auto(), send_get_channel_full_query(channel_full, channel_id, std::move(input_channel), Auto(), source);
"update channel_full cache");
} }
return channel_full; return channel_full;

2
td/telegram/ContactsManager.h
View File

@ -1015,7 +1015,7 @@ class ContactsManager : public Actor {
Channel *add_channel(ChannelId channel_id, const char *source); Channel *add_channel(ChannelId channel_id, const char *source);
const ChannelFull *get_channel_full(ChannelId channel_id) const; const ChannelFull *get_channel_full(ChannelId channel_id) const;
ChannelFull *get_channel_full(ChannelId channel_id); ChannelFull *get_channel_full(ChannelId channel_id, const char *source);
ChannelFull *get_channel_full_force(ChannelId channel_id); ChannelFull *get_channel_full_force(ChannelId channel_id);
ChannelFull *add_channel_full(ChannelId channel_id); ChannelFull *add_channel_full(ChannelId channel_id);

2
td/telegram/MessagesManager.cpp
View File

@ -9428,7 +9428,7 @@ void MessagesManager::repair_channel_server_unread_count(Dialog *d) {
LOG(INFO) << "Reload ChannelFull for " << d->dialog_id << " to repair unread message counts"; LOG(INFO) << "Reload ChannelFull for " << d->dialog_id << " to repair unread message counts";
// TODO logevent? // TODO logevent?
td_->contacts_manager_->get_channel_full(d->dialog_id.get_channel_id(), Auto()); td_->contacts_manager_->get_channel_full(d->dialog_id.get_channel_id(), Promise<Unit>());
} }
void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count, void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count,