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

Improve OrderedMessages::insert.

Browse Source
This commit is contained in:
levlam 2023-05-03 00:25:21 +03:00
parent e39757b6ec
commit 28b742e7d3
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
td/telegram/MessagesManager.cpp
View File

@ -35046,18 +35046,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
Message *result_message = message.get(); Message *result_message = message.get();
d->messages.set(message_id, std::move(message)); d->messages.set(message_id, std::move(message));
OrderedMessage *ordered_message = d->ordered_messages.insert(message_id); d->ordered_messages.insert(message_id, is_attached, have_previous, have_next);
if (!is_attached) {
if (have_next) {
CHECK(!have_previous);
d->ordered_messages.attach_message_to_next(message_id, source);
} else if (have_previous) {
d->ordered_messages.attach_message_to_previous(message_id, source);
}
} else {
ordered_message->have_previous_ = have_previous;
ordered_message->have_next_ = have_next;
}
if (m->message_id.is_yet_unsent() && !m->message_id.is_scheduled() && m->top_thread_message_id.is_valid() && if (m->message_id.is_yet_unsent() && !m->message_id.is_scheduled() && m->top_thread_message_id.is_valid() &&
!td_->auth_manager_->is_bot()) { !td_->auth_manager_->is_bot()) {

15
td/telegram/OrderedMessage.cpp
View File

@ -10,7 +10,7 @@
namespace td { namespace td {
OrderedMessage *OrderedMessages::insert(MessageId message_id) { void OrderedMessages::insert(MessageId message_id, bool was_auto_attached, bool have_previous, bool have_next) {
auto random_y = static_cast<int32>(static_cast<uint32>(message_id.get() * 2101234567u)); auto random_y = static_cast<int32>(static_cast<uint32>(message_id.get() * 2101234567u));
unique_ptr<OrderedMessage> *v = &messages_; unique_ptr<OrderedMessage> *v = &messages_;
while (*v != nullptr && (*v)->random_y_ >= random_y) { while (*v != nullptr && (*v)->random_y_ >= random_y) {
@ -45,7 +45,18 @@ OrderedMessage *OrderedMessages::insert(MessageId message_id) {
CHECK(*left == nullptr); CHECK(*left == nullptr);
CHECK(*right == nullptr); CHECK(*right == nullptr);
*v = std::move(message); *v = std::move(message);
return v->get();
if (!was_auto_attached) {
if (have_next) {
CHECK(!have_previous);
attach_message_to_next(message_id, "OrderedMessages::insert");
} else if (have_previous) {
attach_message_to_previous(message_id, "OrderedMessages::insert");
}
} else {
(*v)->have_previous_ = have_previous;
(*v)->have_next_ = have_next;
}
} }
void OrderedMessages::erase(MessageId message_id) { void OrderedMessages::erase(MessageId message_id) {

2
td/telegram/OrderedMessage.h
View File

@ -169,7 +169,7 @@ class OrderedMessages {
return ConstIterator(messages_.get(), message_id); return ConstIterator(messages_.get(), message_id);
} }
OrderedMessage *insert(MessageId message_id); void insert(MessageId message_id, bool was_auto_attached, bool have_previous, bool have_next);
void erase(MessageId message_id); void erase(MessageId message_id);