From 3ae535eae71380d28ae58e872ccebfdf4fcbfc21 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 14 Sep 2020 02:32:37 +0300 Subject: [PATCH] Make get_message_dialog_id static. GitOrigin-RevId: 66761856feedcd56b491f19538b6ef61260ad5e8 --- td/telegram/MessagesManager.cpp | 8 ++++---- td/telegram/MessagesManager.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index ff9a1b94a..2ea2b7317 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -2409,7 +2409,7 @@ class SendMultiMediaActor : public NetActorOnce { is_result_wrong = true; } for (auto &sent_message : sent_messages) { - if (td->messages_manager_->get_message_dialog_id(*sent_message) != dialog_id_) { + if (MessagesManager::get_message_dialog_id(*sent_message) != dialog_id_) { is_result_wrong = true; } } @@ -3079,7 +3079,7 @@ class ForwardMessagesActor : public NetActorOnce { is_result_wrong = true; } for (auto &sent_message : sent_messages) { - if (td->messages_manager_->get_message_dialog_id(*sent_message) != to_dialog_id_) { + if (MessagesManager::get_message_dialog_id(*sent_message) != to_dialog_id_) { is_result_wrong = true; } } @@ -10906,7 +10906,7 @@ MessageId MessagesManager::get_message_id(const tl_object_ptr &message_ptr) const { +DialogId MessagesManager::get_message_dialog_id(const tl_object_ptr &message_ptr) { switch (message_ptr->get_id()) { case telegram_api::messageEmpty::ID: return DialogId(); @@ -10925,7 +10925,7 @@ DialogId MessagesManager::get_message_dialog_id(const tl_object_ptr &message_ptr, - bool is_scheduled) const { + bool is_scheduled) { return {get_message_dialog_id(message_ptr), get_message_id(message_ptr, is_scheduled)}; } diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index dd6401861..b01c4625c 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -196,7 +196,7 @@ class MessagesManager : public Actor { static MessageId get_message_id(const tl_object_ptr &message_ptr, bool is_scheduled); - DialogId get_message_dialog_id(const tl_object_ptr &message_ptr) const; + static DialogId get_message_dialog_id(const tl_object_ptr &message_ptr); tl_object_ptr get_input_peer(DialogId dialog_id, AccessRights access_rights) const; @@ -1638,7 +1638,7 @@ class MessagesManager : public Actor { static constexpr bool DROP_UPDATES = false; - FullMessageId get_full_message_id(const tl_object_ptr &message_ptr, bool is_scheduled) const; + static FullMessageId get_full_message_id(const tl_object_ptr &message_ptr, bool is_scheduled); static int32 get_message_date(const tl_object_ptr &message_ptr);