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

Use MessageId as map key.

Browse Source 
GitOrigin-RevId: 795c123e953dbdae3c03b828b458910fe221ce90
This commit is contained in:
levlam 2020-10-24 02:00:37 +03:00
parent 0846e7aec5
commit 978863810c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
td/telegram/MessagesManager.cpp
View File

@ -22233,7 +22233,7 @@ void MessagesManager::cancel_send_message_query(DialogId dialog_id, Message *m)
if (queue_it != yet_unsent_media_queues_.end()) {
auto &queue = queue_it->second;
LOG(INFO) << "Delete " << m->message_id << " from queue " << queue_id;
if (queue.erase(m->message_id.get()) != 0) {
if (queue.erase(m->message_id) != 0) {
if (queue.empty()) {
yet_unsent_media_queues_.erase(queue_it);
} else {
@ -23136,7 +23136,7 @@ void MessagesManager::on_media_message_ready_to_send(DialogId dialog_id, Message
auto queue_id = get_sequence_dispatcher_id(dialog_id, MessageContentType::Photo);
CHECK(queue_id & 1);
auto &queue = yet_unsent_media_queues_[queue_id];
auto it = queue.find(message_id.get());
auto it = queue.find(message_id);
if (it == queue.end()) {
if (queue.empty()) {
yet_unsent_media_queues_.erase(queue_id);
@ -23176,7 +23176,7 @@ void MessagesManager::on_yet_unsent_media_queue_updated(DialogId dialog_id) {
return;
}
auto m = get_message({dialog_id, MessageId(first_it->first)});
auto m = get_message({dialog_id, first_it->first});
auto promise = std::move(first_it->second);
queue.erase(first_it);
LOG(INFO) << "Queue for " << dialog_id << " now has size " << queue.size();
@ -28929,12 +28929,11 @@ void MessagesManager::on_send_dialog_action_timeout(DialogId dialog_id) {
pending_send_dialog_action_timeout_.add_timeout_in(dialog_id.get(), 4.0);
CHECK(!queue_it->second.empty());
MessageId message_id(queue_it->second.begin()->first);
const Message *m = get_message(d, message_id);
const Message *m = get_message(d, queue_it->second.begin()->first);
if (m == nullptr) {
return;
}
if (m->forward_info != nullptr || m->had_forward_info || message_id.is_scheduled()) {
if (m->forward_info != nullptr || m->had_forward_info || m->message_id.is_scheduled()) {
return;
}
@ -30745,7 +30744,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
auto queue_id = get_sequence_dispatcher_id(dialog_id, message_content_type);
if (queue_id & 1) {
LOG(INFO) << "Add " << message_id << " from " << source << " to queue " << queue_id;
yet_unsent_media_queues_[queue_id][message_id.get()]; // reserve place for promise
yet_unsent_media_queues_[queue_id][message_id]; // reserve place for promise
if (!td_->auth_manager_->is_bot()) {
pending_send_dialog_action_timeout_.add_timeout_in(dialog_id.get(), 1.0);
}

2
td/telegram/MessagesManager.h
View File

@ -3206,7 +3206,7 @@ class MessagesManager : public Actor {
int64 viewed_live_location_task_id_ = 0;
std::unordered_map<int64, FullMessageId> viewed_live_location_tasks_; // task_id -> task
std::unordered_map<uint64, std::map<int64, Promise<Message *>>> yet_unsent_media_queues_;
std::unordered_map<uint64, std::map<MessageId, Promise<Message *>>> yet_unsent_media_queues_;
std::unordered_map<DialogId, NetQueryRef, DialogIdHash> set_typing_query_;