From b72fd097564a75ff297a747ef4a98aadc18bb474 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 14 Feb 2018 08:51:35 +0300 Subject: [PATCH] Fix get_replied_message. GitOrigin-RevId: de539d5bf3f676ad67805524b7b61d60cb4f5cc3 --- td/telegram/MessagesManager.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 548bad77..daa60a73 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -11049,6 +11049,7 @@ void MessagesManager::get_message(FullMessageId full_message_id, Promise & MessageId MessagesManager::get_replied_message(DialogId dialog_id, MessageId message_id, bool force, Promise &&promise) { + LOG(INFO) << "Get replied message to " << message_id << " in " << dialog_id; Dialog *d = get_dialog_force(dialog_id); if (d == nullptr) { promise.set_error(Status::Error(6, "Chat not found")); @@ -11065,14 +11066,13 @@ MessageId MessagesManager::get_replied_message(DialogId dialog_id, MessageId mes return MessageId(); } - auto replied_message_id = get_replied_message_id(m); - if (!replied_message_id.is_valid()) { - promise.set_value(Unit()); - return MessageId(); + tl_object_ptr input_message; + if (message_id.is_server()) { + input_message = make_tl_object(message_id.get_server_message_id().get()); } - get_message_force_from_server( - d, replied_message_id, std::move(promise), - make_tl_object(message_id.get_server_message_id().get())); + auto replied_message_id = get_replied_message_id(m); + get_message_force_from_server(d, replied_message_id, std::move(promise), std::move(input_message)); + return replied_message_id; }