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

Send update only if the first shortcut message changes.

Browse Source
This commit is contained in:
levlam 2024-02-22 21:57:43 +03:00
parent 9af1639168
commit c73a19c319
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
td/telegram/QuickReplyManager.cpp
View File

@ -354,8 +354,11 @@ void QuickReplyManager::on_reload_quick_reply_shortcuts(
shortcut->messages_.push_back(std::move(message)); shortcut->messages_.push_back(std::move(message));
auto old_shortcut = get_shortcut(shortcut->shortcut_id_); auto old_shortcut = get_shortcut(shortcut->shortcut_id_);
if (old_shortcut == nullptr || update_shortcut_from(shortcut.get(), old_shortcut, true)) { auto is_object_changed = false;
changed_shortcut_ids.push_back(shortcut->shortcut_id_); if (old_shortcut == nullptr || update_shortcut_from(shortcut.get(), old_shortcut, true, &is_object_changed)) {
if (old_shortcut == nullptr || is_object_changed) {
changed_shortcut_ids.push_back(shortcut->shortcut_id_);
}
} }
old_shortcut_ids.erase(shortcut->shortcut_id_); old_shortcut_ids.erase(shortcut->shortcut_id_);
@ -445,12 +448,14 @@ vector<QuickReplyManager::QuickReplyMessageUniqueId> QuickReplyManager::get_serv
return message_ids; return message_ids;
} }
bool QuickReplyManager::update_shortcut_from(Shortcut *new_shortcut, Shortcut *old_shortcut, bool is_partial) { bool QuickReplyManager::update_shortcut_from(Shortcut *new_shortcut, Shortcut *old_shortcut, bool is_partial,
bool *is_object_changed) {
CHECK(old_shortcut != nullptr); CHECK(old_shortcut != nullptr);
CHECK(new_shortcut != nullptr); CHECK(new_shortcut != nullptr);
CHECK(old_shortcut->shortcut_id_ == new_shortcut->shortcut_id_); CHECK(old_shortcut->shortcut_id_ == new_shortcut->shortcut_id_);
CHECK(!old_shortcut->messages_.empty()); CHECK(!old_shortcut->messages_.empty());
CHECK(!new_shortcut->messages_.empty()); CHECK(!new_shortcut->messages_.empty());
auto old_unique_id = get_quick_reply_unique_id(old_shortcut->messages_[0].get());
auto old_message_count = get_shortcut_message_count(old_shortcut); auto old_message_count = get_shortcut_message_count(old_shortcut);
bool is_changed = false; bool is_changed = false;
if (is_partial) { if (is_partial) {
@ -488,8 +493,10 @@ bool QuickReplyManager::update_shortcut_from(Shortcut *new_shortcut, Shortcut *o
sort_quick_reply_messages(new_shortcut->messages_); sort_quick_reply_messages(new_shortcut->messages_);
} }
} }
return is_changed || new_shortcut->name_ != old_shortcut->name_ || *is_object_changed = old_unique_id != get_quick_reply_unique_id(new_shortcut->messages_[0].get()) ||
old_message_count != get_shortcut_message_count(new_shortcut); new_shortcut->name_ != old_shortcut->name_ ||
old_message_count != get_shortcut_message_count(new_shortcut);
return *is_object_changed || is_changed || old_shortcut->total_count_ != new_shortcut->total_count_;
} }
td_api::object_ptr<td_api::updateQuickReplyShortcut> QuickReplyManager::get_update_quick_reply_shortcut_object( td_api::object_ptr<td_api::updateQuickReplyShortcut> QuickReplyManager::get_update_quick_reply_shortcut_object(

3
td/telegram/QuickReplyManager.h
View File

@ -153,7 +153,8 @@ class QuickReplyManager final : public Actor {
static vector<QuickReplyMessageUniqueId> get_server_quick_reply_unique_ids( static vector<QuickReplyMessageUniqueId> get_server_quick_reply_unique_ids(
const vector<unique_ptr<QuickReplyMessage>> &messages); const vector<unique_ptr<QuickReplyMessage>> &messages);
static bool update_shortcut_from(Shortcut *new_shortcut, Shortcut *old_shortcut, bool is_partial); static bool update_shortcut_from(Shortcut *new_shortcut, Shortcut *old_shortcut, bool is_partial,
bool *is_object_changed);
td_api::object_ptr<td_api::updateQuickReplyShortcut> get_update_quick_reply_shortcut_object(const Shortcut *s, td_api::object_ptr<td_api::updateQuickReplyShortcut> get_update_quick_reply_shortcut_object(const Shortcut *s,
const char *source) const; const char *source) const;