andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Add debug to attach_message.

Browse Source 
GitOrigin-RevId: d148fce42b3e59a30119c827b5ef1e736dfaa1a5
This commit is contained in:
levlam 2018-04-02 02:30:25 +03:00
parent a987ec3b00
commit e9490eb6e1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/MessagesManager.cpp
View File

@ -6861,7 +6861,7 @@ void MessagesManager::on_get_history(DialogId dialog_id, MessageId from_message_
if (!next_message->have_previous) { if (!next_message->have_previous) {
LOG(INFO) << "Fix have_previous for " << first_added_message_id; LOG(INFO) << "Fix have_previous for " << first_added_message_id;
next_message->have_previous = true; next_message->have_previous = true;
attach_message_to_previous(d, first_added_message_id); attach_message_to_previous(d, first_added_message_id, "on_get_history");
} }
} }
first_added_message_id = message_id; first_added_message_id = message_id;
@ -14002,7 +14002,7 @@ void MessagesManager::on_get_history_from_database(DialogId dialog_id, MessageId
if (next_message != nullptr && !next_message->have_previous) { if (next_message != nullptr && !next_message->have_previous) {
LOG(INFO) << "Fix have_previous for " << next_message->message_id; LOG(INFO) << "Fix have_previous for " << next_message->message_id;
next_message->have_previous = true; next_message->have_previous = true;
attach_message_to_previous(d, next_message->message_id); attach_message_to_previous(d, next_message->message_id, "on_get_history_from_database");
} }
have_next = true; have_next = true;
@ -22045,9 +22045,9 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
if (!is_attached) { if (!is_attached) {
if ((*v)->have_next) { if ((*v)->have_next) {
CHECK(!(*v)->have_previous); CHECK(!(*v)->have_previous);
attach_message_to_next(d, message_id); attach_message_to_next(d, message_id, source);
} else if ((*v)->have_previous) { } else if ((*v)->have_previous) {
attach_message_to_previous(d, message_id); attach_message_to_previous(d, message_id, source);
} }
} }
@ -22273,13 +22273,13 @@ void MessagesManager::do_delete_message_logevent(const DeleteMessageLogEvent &lo
G()->td_db()->get_messages_db_async()->delete_message(logevent.full_message_id_, std::move(db_promise)); G()->td_db()->get_messages_db_async()->delete_message(logevent.full_message_id_, std::move(db_promise));
} }
void MessagesManager::attach_message_to_previous(Dialog *d, MessageId message_id) { void MessagesManager::attach_message_to_previous(Dialog *d, MessageId message_id, const char *source) {
CHECK(d != nullptr); CHECK(d != nullptr);
MessagesIterator it(d, message_id); MessagesIterator it(d, message_id);
Message *message = *it; Message *message = *it;
CHECK(message != nullptr); CHECK(message != nullptr);
CHECK(message->message_id == message_id); CHECK(message->message_id == message_id);
CHECK(message->have_previous); CHECK(message->have_previous) << d->dialog_id << " " << message_id << " " << source;
--it; --it;
CHECK(*it != nullptr); CHECK(*it != nullptr);
LOG(INFO) << "Attach " << message_id << " to the previous " << (*it)->message_id; LOG(INFO) << "Attach " << message_id << " to the previous " << (*it)->message_id;
@ -22290,13 +22290,13 @@ void MessagesManager::attach_message_to_previous(Dialog *d, MessageId message_id
} }
} }
void MessagesManager::attach_message_to_next(Dialog *d, MessageId message_id) { void MessagesManager::attach_message_to_next(Dialog *d, MessageId message_id, const char *source) {
CHECK(d != nullptr); CHECK(d != nullptr);
MessagesIterator it(d, message_id); MessagesIterator it(d, message_id);
Message *message = *it; Message *message = *it;
CHECK(message != nullptr); CHECK(message != nullptr);
CHECK(message->message_id == message_id); CHECK(message->message_id == message_id);
CHECK(message->have_next); CHECK(message->have_next) << d->dialog_id << " " << message_id << " " << source;
++it; ++it;
CHECK(*it != nullptr); CHECK(*it != nullptr);
LOG(INFO) << "Attach " << message_id << " to the next " << (*it)->message_id; LOG(INFO) << "Attach " << message_id << " to the next " << (*it)->message_id;
@ -22481,10 +22481,10 @@ void MessagesManager::update_message(Dialog *d, unique_ptr<Message> &old_message
CHECK(!new_message->have_previous || !new_message->have_next); CHECK(!new_message->have_previous || !new_message->have_next);
if (new_message->have_previous && !old_message->have_previous) { if (new_message->have_previous && !old_message->have_previous) {
old_message->have_previous = true; old_message->have_previous = true;
attach_message_to_previous(d, message_id); attach_message_to_previous(d, message_id, "update_message");
} else if (new_message->have_next && !old_message->have_next) { } else if (new_message->have_next && !old_message->have_next) {
old_message->have_next = true; old_message->have_next = true;
attach_message_to_next(d, message_id); attach_message_to_next(d, message_id, "update_message");
} }
if (update_message_content(dialog_id, old_message.get(), old_message->content, std::move(new_message->content), if (update_message_content(dialog_id, old_message.get(), old_message->content, std::move(new_message->content),

4
td/telegram/MessagesManager.h
View File

@ -2065,9 +2065,9 @@ class MessagesManager : public Actor {
void do_delete_message_logevent(const DeleteMessageLogEvent &logevent) const; void do_delete_message_logevent(const DeleteMessageLogEvent &logevent) const;
void attach_message_to_previous(Dialog *d, MessageId message_id); void attach_message_to_previous(Dialog *d, MessageId message_id, const char *source);
void attach_message_to_next(Dialog *d, MessageId message_id); void attach_message_to_next(Dialog *d, MessageId message_id, const char *source);
void update_message(Dialog *d, unique_ptr<Message> &old_message, unique_ptr<Message> new_message, void update_message(Dialog *d, unique_ptr<Message> &old_message, unique_ptr<Message> new_message,
bool need_send_update_message_content, bool *need_update_dialog_pos); bool need_send_update_message_content, bool *need_update_dialog_pos);