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

Move pending_viewed_live_locations out of Dialog.

Browse Source
This commit is contained in:
levlam 2023-03-16 16:15:54 +03:00
parent 0ffd1718be
commit 97fa882a8f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
td/telegram/MessagesManager.cpp
View File

@ -21921,12 +21921,15 @@ void MessagesManager::close_dialog(Dialog *d) {
dialog_viewed_messages_.erase(dialog_id);
update_viewed_messages_timeout_.cancel_timeout(dialog_id.get());
for (auto &it : d->pending_viewed_live_locations) {
auto live_location_task_id = it.second;
auto erased_count = viewed_live_location_tasks_.erase(live_location_task_id);
CHECK(erased_count > 0);
auto live_locations_it = pending_viewed_live_locations_.find(dialog_id);
if (live_locations_it != pending_viewed_live_locations_.end()) {
for (auto &it : live_locations_it->second) {
auto live_location_task_id = it.second;
auto erased_count = viewed_live_location_tasks_.erase(live_location_task_id);
CHECK(erased_count > 0);
}
pending_viewed_live_locations_.erase(live_locations_it);
}
d->pending_viewed_live_locations.clear();
switch (dialog_id.get_type()) {
case DialogType::User:
@ -23550,7 +23553,7 @@ void MessagesManager::on_message_live_location_viewed(Dialog *d, const Message *
return;
}
auto &live_location_task_id = d->pending_viewed_live_locations[m->message_id];
auto &live_location_task_id = pending_viewed_live_locations_[d->dialog_id][m->message_id];
if (live_location_task_id != 0) {
return;
}
@ -23577,8 +23580,13 @@ void MessagesManager::view_message_live_location_on_server(int64 task_id) {
if (m == nullptr || get_message_content_live_location_period(m->content.get()) <= G()->unix_time() - m->date + 1) {
// the message was deleted or live location is expired
viewed_live_location_tasks_.erase(it);
auto erased_count = d->pending_viewed_live_locations.erase(full_message_id.get_message_id());
auto live_locations_it = pending_viewed_live_locations_.find(d->dialog_id);
CHECK(live_locations_it != pending_viewed_live_locations_.end());
auto erased_count = live_locations_it->second.erase(full_message_id.get_message_id());
CHECK(erased_count > 0);
if (live_locations_it->second.empty()) {
pending_viewed_live_locations_.erase(live_locations_it);
}
return;
}

4
td/telegram/MessagesManager.h
View File

@ -1437,8 +1437,6 @@ class MessagesManager final : public Actor {
MessageId suffix_load_query_message_id_;
std::vector<std::pair<Promise<Unit>, std::function<bool(const Message *)>>> suffix_load_queries_;
FlatHashMap<MessageId, int64, MessageIdHash> pending_viewed_live_locations; // message_id -> task_id
unique_ptr<Message> messages;
unique_ptr<Message> scheduled_messages;
@ -3713,6 +3711,8 @@ class MessagesManager final : public Actor {
int64 viewed_live_location_task_id_ = 0;
FlatHashMap<int64, FullMessageId> viewed_live_location_tasks_; // task_id -> task
FlatHashMap<DialogId, FlatHashMap<MessageId, int64, MessageIdHash>, DialogIdHash>
pending_viewed_live_locations_; // ... -> task_id
FlatHashMap<uint64, std::map<MessageId, Promise<Message *>>> yet_unsent_media_queues_;