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

Allow to use getTopChats without chat info database.

Browse Source
This commit is contained in:
levlam 2023-08-23 18:28:07 +03:00
parent 2e5caa9f13
commit d1172d8530
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6371,7 +6371,7 @@ searchChatsOnServer query:string limit:int32 = Chats;
//@location Current user location
searchChatsNearby location:location = ChatsNearby;
//@description Returns a list of frequently used chats. Supported only if the chat info database is enabled @category Category of chats to be returned @limit The maximum number of chats to be returned; up to 30
//@description Returns a list of frequently used chats @category Category of chats to be returned @limit The maximum number of chats to be returned; up to 30
getTopChats category:TopChatCategory limit:int32 = Chats;
//@description Removes a chat from the list of frequently used chats. Supported only if the chat info database is enabled @category Category of frequently used chats @chat_id Chat identifier

2
td/telegram/TdDb.cpp
View File

@ -421,7 +421,7 @@ Status TdDb::init_sqlite(const Parameters &parameters, const DbKey &key, const D
binlog_pmc.erase_by_prefix("unread_message_count");
binlog_pmc.erase_by_prefix("unread_dialog_count");
binlog_pmc.erase("sponsored_dialog_id");
binlog_pmc.erase_by_prefix("top_dialogs");
binlog_pmc.erase_by_prefix("top_dialogs#");
binlog_pmc.erase("dlds_counter");
binlog_pmc.erase_by_prefix("dlds#");
binlog_pmc.erase("fetched_marks_as_unread");

29
td/telegram/TopDialogManager.cpp
View File

@ -277,11 +277,8 @@ void TopDialogManager::get_top_dialogs(TopDialogCategory category, int32 limit,
if (limit <= 0) {
return promise.set_error(Status::Error(400, "Limit must be positive"));
}
if (!is_active_) {
return promise.set_error(Status::Error(400, "Not supported without chat info database"));
}
if (!is_enabled_) {
return promise.set_error(Status::Error(400, "Top chats computation is disabled"));
return promise.set_error(Status::Error(400, "Top chat computation is disabled"));
}
GetTopDialogsQuery query;
@ -527,17 +524,18 @@ void TopDialogManager::on_get_top_peers(Result<telegram_api::object_ptr<telegram
void TopDialogManager::do_save_top_dialogs() {
LOG(INFO) << "Save top chats";
for (size_t top_dialog_category_i = 0; top_dialog_category_i < by_category_.size(); top_dialog_category_i++) {
auto top_dialog_category = TopDialogCategory(top_dialog_category_i);
auto key = PSTRING() << "top_dialogs#" << get_top_dialog_category_name(top_dialog_category);
auto &top_dialogs = by_category_[top_dialog_category_i];
if (!top_dialogs.is_dirty) {
continue;
}
top_dialogs.is_dirty = false;
if (G()->use_chat_info_database()) {
auto top_dialog_category = TopDialogCategory(top_dialog_category_i);
auto key = PSTRING() << "top_dialogs#" << get_top_dialog_category_name(top_dialog_category);
G()->td_db()->get_binlog_pmc()->set(key, log_event_store(top_dialogs).as_slice().str());
}
}
db_sync_state_ = SyncState::Ok;
first_unsync_change_ = Timestamp();
}
@ -555,7 +553,7 @@ void TopDialogManager::init() {
return;
}
is_active_ = G()->use_chat_info_database() && !td_->auth_manager_->is_bot();
is_active_ = !td_->auth_manager_->is_bot();
is_enabled_ = !G()->get_option_boolean("disable_top_chats");
update_rating_e_decay();
@ -587,10 +585,10 @@ void TopDialogManager::try_start() {
if (last_server_sync_.is_in_past()) {
server_sync_state_ = SyncState::Ok;
}
is_synchronized_ = true;
is_synchronized_ = G()->use_chat_info_database();
}
if (is_enabled_) {
if (is_enabled_ && G()->use_chat_info_database()) {
for (size_t top_dialog_category_i = 0; top_dialog_category_i < by_category_.size(); top_dialog_category_i++) {
auto top_dialog_category = TopDialogCategory(top_dialog_category_i);
auto key = PSTRING() << "top_dialogs#" << get_top_dialog_category_name(top_dialog_category);
@ -607,9 +605,7 @@ void TopDialogManager::try_start() {
} else {
G()->td_db()->get_binlog_pmc()->erase_by_prefix("top_dialogs#");
for (auto &top_dialogs : by_category_) {
top_dialogs.is_dirty = false;
top_dialogs.rating_timestamp = 0;
top_dialogs.dialogs.clear();
top_dialogs = {};
}
}
db_sync_state_ = SyncState::Ok;
@ -632,7 +628,7 @@ void TopDialogManager::loop() {
return;
}
if (!pending_get_top_dialogs_.empty()) {
if (!pending_get_top_dialogs_.empty() && (is_synchronized_ || !is_enabled_)) {
for (auto &query : pending_get_top_dialogs_) {
do_get_top_dialogs(std::move(query));
}
@ -642,7 +638,8 @@ void TopDialogManager::loop() {
// server sync
Timestamp server_sync_timeout;
if (server_sync_state_ == SyncState::Ok) {
server_sync_timeout = Timestamp::at(last_server_sync_.at() + SERVER_SYNC_DELAY);
server_sync_timeout = pending_get_top_dialogs_.empty() ? Timestamp::at(last_server_sync_.at() + SERVER_SYNC_DELAY)
: Timestamp::now_cached();
if (server_sync_timeout.is_in_past()) {
server_sync_state_ = SyncState::None;
}
@ -651,7 +648,7 @@ void TopDialogManager::loop() {
Timestamp wakeup_timeout;
if (server_sync_state_ == SyncState::Ok) {
wakeup_timeout.relax(server_sync_timeout);
} else if (server_sync_state_ == SyncState::None && was_first_sync_) {
} else if (server_sync_state_ == SyncState::None && (was_first_sync_ || !pending_get_top_dialogs_.empty())) {
server_sync_state_ = SyncState::Pending;
do_get_top_peers();
}