From cccab2ba620ce4cbe7fdbad20ce06a1384e1eada Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 8 Jan 2019 22:48:43 +0300 Subject: [PATCH] Better forward_info changes logging. GitOrigin-RevId: 49ba4447cbe7998e7c275377e545c2fe7e54b92a --- td/telegram/MessagesManager.cpp | 7 +++++-- td/telegram/cli.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index c841822f..8b09bf7f 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -21762,14 +21762,17 @@ void MessagesManager::update_message(Dialog *d, unique_ptr &old_message old_message->forward_info->author_signature = new_message->forward_info->author_signature; LOG_IF(ERROR, *old_message->forward_info != *new_message->forward_info) << message_id << " in " << dialog_id << " has changed forward info from " << *old_message->forward_info - << " to " << *new_message->forward_info << ", really forwarded from " << old_message->debug_forward_from; + << " to " << *new_message->forward_info << ", really forwarded from " << old_message->debug_forward_from + << ", message content type is " << old_message->content->get_type() << '/' + << new_message->content->get_type(); } old_message->forward_info = std::move(new_message->forward_info); is_changed = true; } else { LOG(ERROR) << message_id << " in " << dialog_id << " sent by " << old_message->sender_user_id << " has lost forward info " << *old_message->forward_info << ", really forwarded from " - << old_message->debug_forward_from; + << old_message->debug_forward_from << ", message content type is " << old_message->content->get_type() + << '/' << new_message->content->get_type(); old_message->forward_info = nullptr; is_changed = true; } diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp index a8f1f819..ff6adf06 100644 --- a/td/telegram/cli.cpp +++ b/td/telegram/cli.cpp @@ -3373,15 +3373,15 @@ class CliClient final : public Actor { string mute_for; string sound; - string show_previews; + string show_preview; std::tie(mute_for, settings) = split(settings, ','); - std::tie(sound, show_previews) = split(settings, ','); + std::tie(sound, show_preview) = split(settings, ','); send_request(make_tl_object( as_chat_id(chat_id), make_tl_object(mute_for.empty(), to_integer(mute_for), sound.empty(), - sound, show_previews.empty(), as_bool(show_previews)))); + sound, show_preview.empty(), as_bool(show_preview)))); } else if (op == "ssns") { string scope; string settings; @@ -3390,14 +3390,14 @@ class CliClient final : public Actor { string mute_for; string sound; - string show_previews; + string show_preview; std::tie(mute_for, settings) = split(settings, ','); - std::tie(sound, show_previews) = split(settings, ','); + std::tie(sound, show_preview) = split(settings, ','); send_request(make_tl_object( get_notification_settings_scope(scope), make_tl_object( - to_integer(mute_for), sound, as_bool(show_previews)))); + to_integer(mute_for), sound, as_bool(show_preview)))); } else if (op == "rans") { send_request(make_tl_object()); } else if (op == "rn") {