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

Save and load suggested actions to and from binlog.

Browse Source
This commit is contained in:
levlam 2024-03-31 01:10:26 +03:00
parent 3cbe6c494e
commit bdbf9adb17
4 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
td/telegram/ConfigManager.cpp
View File

@ -27,6 +27,7 @@
#include "td/telegram/Premium.h"
#include "td/telegram/ReactionType.h"
#include "td/telegram/StateManager.h"
#include "td/telegram/SuggestedAction.hpp"
#include "td/telegram/Td.h"
#include "td/telegram/TdDb.h"
#include "td/telegram/telegram_api.h"
@ -950,6 +951,18 @@ void ConfigManager::start_up() {
expire_time_ = expire_time;
set_timeout_in(expire_time_.in());
}
auto log_event_string = G()->td_db()->get_binlog_pmc()->get(get_suggested_actions_database_key());
if (!log_event_string.empty()) {
vector<SuggestedAction> suggested_actions;
auto status = log_event_parse(suggested_actions, log_event_string);
if (status.is_error()) {
LOG(ERROR) << "Failed to parse suggested actions from binlog: " << status;
save_suggested_actions();
} else {
update_suggested_actions(suggested_actions_, std::move(suggested_actions));
}
}
}
ActorShared<> ConfigManager::create_reference() {
@ -1115,7 +1128,9 @@ void ConfigManager::do_set_ignore_sensitive_content_restrictions(bool ignore_sen
}
void ConfigManager::hide_suggested_action(SuggestedAction suggested_action) {
remove_suggested_action(suggested_actions_, suggested_action);
if (remove_suggested_action(suggested_actions_, suggested_action)) {
save_suggested_actions();
}
}
void ConfigManager::dismiss_suggested_action(SuggestedAction suggested_action, Promise<Unit> &&promise) {
@ -1156,7 +1171,9 @@ void ConfigManager::on_result(NetQueryPtr net_query) {
fail_promises(promises, result_ptr.move_as_error());
return;
}
remove_suggested_action(suggested_actions_, suggested_action);
if (remove_suggested_action(suggested_actions_, suggested_action)) {
save_suggested_actions();
}
reget_app_config(Auto());
set_promises(promises);
@ -2180,7 +2197,22 @@ void ConfigManager::process_app_config(tl_object_ptr<telegram_api::JSONValue> &c
// do not update suggested actions while changing content settings or dismissing an action
if (!is_set_content_settings_request_sent_ && dismiss_suggested_action_request_count_ == 0) {
update_suggested_actions(suggested_actions_, std::move(suggested_actions));
if (update_suggested_actions(suggested_actions_, std::move(suggested_actions))) {
save_suggested_actions();
}
}
}
string ConfigManager::get_suggested_actions_database_key() {
return "suggested_actions";
}
void ConfigManager::save_suggested_actions() {
if (suggested_actions_.empty()) {
G()->td_db()->get_binlog_pmc()->erase(get_suggested_actions_database_key());
} else {
G()->td_db()->get_binlog_pmc()->set(get_suggested_actions_database_key(),
log_event_store(suggested_actions_).as_slice().str());
}
}

6
td/telegram/ConfigManager.h
View File

@ -103,7 +103,7 @@ class ConfigManager final : public NetQueryCallback {
private:
struct AppConfig {
static constexpr int32 CURRENT_VERSION = 34;
static constexpr int32 CURRENT_VERSION = 35;
int32 version_ = 0;
int32 hash_ = 0;
telegram_api::object_ptr<telegram_api::JSONValue> config_;
@ -159,6 +159,10 @@ class ConfigManager final : public NetQueryCallback {
void do_set_ignore_sensitive_content_restrictions(bool ignore_sensitive_content_restrictions);
static string get_suggested_actions_database_key();
void save_suggested_actions();
static Timestamp load_config_expire_time();
static void save_config_expire(Timestamp timestamp);
static void save_dc_options_update(const DcOptions &dc_options);

9
td/telegram/SuggestedAction.cpp
View File

@ -182,11 +182,11 @@ td_api::object_ptr<td_api::updateSuggestedActions> get_update_suggested_actions_
transform(removed_actions, get_object));
}
void update_suggested_actions(vector<SuggestedAction> &suggested_actions,
bool update_suggested_actions(vector<SuggestedAction> &suggested_actions,
vector<SuggestedAction> &&new_suggested_actions) {
td::unique(new_suggested_actions);
if (new_suggested_actions == suggested_actions) {
return;
return false;
}
vector<SuggestedAction> added_actions;
@ -207,13 +207,16 @@ void update_suggested_actions(vector<SuggestedAction> &suggested_actions,
suggested_actions = std::move(new_suggested_actions);
send_closure(G()->td(), &Td::send_update,
get_update_suggested_actions_object(added_actions, removed_actions, "update_suggested_actions"));
return true;
}
void remove_suggested_action(vector<SuggestedAction> &suggested_actions, SuggestedAction suggested_action) {
bool remove_suggested_action(vector<SuggestedAction> &suggested_actions, SuggestedAction suggested_action) {
if (td::remove(suggested_actions, suggested_action)) {
send_closure(G()->td(), &Td::send_update,
get_update_suggested_actions_object({}, {suggested_action}, "remove_suggested_action"));
return true;
}
return false;
}
void dismiss_suggested_action(SuggestedAction action, Promise<Unit> &&promise) {

4
td/telegram/SuggestedAction.h
View File

@ -80,10 +80,10 @@ inline bool operator<(const SuggestedAction &lhs, const SuggestedAction &rhs) {
td_api::object_ptr<td_api::updateSuggestedActions> get_update_suggested_actions_object(
const vector<SuggestedAction> &added_actions, const vector<SuggestedAction> &removed_actions, const char *source);
void update_suggested_actions(vector<SuggestedAction> &suggested_actions,
bool update_suggested_actions(vector<SuggestedAction> &suggested_actions,
vector<SuggestedAction> &&new_suggested_actions);
void remove_suggested_action(vector<SuggestedAction> &suggested_actions, SuggestedAction suggested_action);
bool remove_suggested_action(vector<SuggestedAction> &suggested_actions, SuggestedAction suggested_action);
void dismiss_suggested_action(SuggestedAction action, Promise<Unit> &&promise);