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

Return server shortcut by temporary identifier.

Browse Source
This commit is contained in:
levlam 2024-04-30 00:03:17 +03:00
parent 061e11690d
commit 78038f1fc9
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
td/telegram/QuickReplyManager.cpp
View File

@ -1377,6 +1377,7 @@ void QuickReplyManager::on_reload_quick_reply_shortcuts(
send_update_quick_reply_shortcut_deleted(old_shortcut);
changed_shortcut_ids.push_back(shortcut->shortcut_id_);
changed_message_shortcut_ids.push_back(shortcut->shortcut_id_);
persistent_shortcut_ids_[shortcut_id] = shortcut->shortcut_id_;
break;
}
}
@ -1806,7 +1807,7 @@ void QuickReplyManager::process_send_quick_reply_updates(QuickReplyShortcutId sh
td_->chat_manager_->on_get_chats(std::move(updates->chats_), "process_send_quick_reply_updates");
bool is_shortcut_new = false;
if (!shortcut_id.is_server()) {
if (shortcut_id.is_local()) {
QuickReplyShortcutId new_shortcut_id;
for (auto &update : updates->updates_) {
if (update->get_id() == telegram_api::updateNewQuickReply::ID) {
@ -1835,7 +1836,7 @@ void QuickReplyManager::process_send_quick_reply_updates(QuickReplyShortcutId sh
return;
}
auto it = get_shortcut_it(shortcut_id);
if (it != shortcuts_.shortcuts_.end()) {
if (it != shortcuts_.shortcuts_.end() && (*it)->shortcut_id_ == shortcut_id) {
send_update_quick_reply_shortcut_deleted(it->get());
for (auto &message : (*it)->messages_) {
@ -1858,6 +1859,7 @@ void QuickReplyManager::process_send_quick_reply_updates(QuickReplyShortcutId sh
}
shortcuts_.shortcuts_.erase(it);
}
persistent_shortcut_ids_[shortcut_id] = new_shortcut_id;
} else if (get_shortcut(new_shortcut_id) == nullptr) {
return;
}
@ -3162,6 +3164,12 @@ QuickReplyManager::Shortcut *QuickReplyManager::get_shortcut(QuickReplyShortcutI
return shortcut.get();
}
}
if (shortcut_id.is_local()) {
auto it = persistent_shortcut_ids_.find(shortcut_id);
if (it != persistent_shortcut_ids_.end()) {
return get_shortcut(it->second);
}
}
return nullptr;
}
@ -3174,6 +3182,12 @@ const QuickReplyManager::Shortcut *QuickReplyManager::get_shortcut(QuickReplySho
return shortcut.get();
}
}
if (shortcut_id.is_local()) {
auto it = persistent_shortcut_ids_.find(shortcut_id);
if (it != persistent_shortcut_ids_.end()) {
return get_shortcut(it->second);
}
}
return nullptr;
}
@ -3196,6 +3210,12 @@ vector<unique_ptr<QuickReplyManager::Shortcut>>::iterator QuickReplyManager::get
return it;
}
}
if (shortcut_id.is_local()) {
auto it = persistent_shortcut_ids_.find(shortcut_id);
if (it != persistent_shortcut_ids_.end()) {
return get_shortcut_it(it->second);
}
}
return shortcuts_.shortcuts_.end();
}
@ -3385,6 +3405,7 @@ void QuickReplyManager::update_shortcut_from(Shortcut *new_shortcut, Shortcut *o
bool *is_shortcut_changed, bool *are_messages_changed) {
CHECK(old_shortcut != nullptr);
CHECK(new_shortcut != nullptr);
CHECK(old_shortcut->shortcut_id_.is_server());
CHECK(old_shortcut->shortcut_id_ == new_shortcut->shortcut_id_);
CHECK(!old_shortcut->messages_.empty());
CHECK(!new_shortcut->messages_.empty());

2
td/telegram/QuickReplyManager.h
View File

@ -427,6 +427,8 @@ class QuickReplyManager final : public Actor {
FlatHashSet<QuickReplyShortcutId, QuickReplyShortcutIdHash> deleted_shortcut_ids_;
FlatHashMap<QuickReplyShortcutId, QuickReplyShortcutId, QuickReplyShortcutIdHash> persistent_shortcut_ids_;
FlatHashMap<QuickReplyShortcutId, vector<Promise<Unit>>, QuickReplyShortcutIdHash> get_shortcut_messages_queries_;
FlatHashSet<QuickReplyMessageFullId, QuickReplyMessageFullIdHash> deleted_message_full_ids_;

4
td/telegram/QuickReplyShortcutId.h
View File

@ -66,6 +66,10 @@ class QuickReplyShortcutId {
return id > 0 && id <= MAX_SERVER_SHORTCUT_ID;
}
bool is_local() const {
return id > MAX_SERVER_SHORTCUT_ID;
}
template <class StorerT>
void store(StorerT &storer) const {
storer.store_int(id);