From d6dd0a0bb9b6082505af348df71b8303cb5ed228 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 21 Feb 2019 02:13:20 +0300
Subject: [PATCH] Better updating message forward info.

GitOrigin-RevId: a5448c7b63b91f42088e26e00346cc7094ddea92
---
 td/telegram/MessagesManager.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 4c1c99da1..ea2eaaff9 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -22251,21 +22251,23 @@ void MessagesManager::update_message(Dialog *d, unique_ptr<Message> &old_message
       LOG(ERROR) << message_id << " in " << dialog_id << " has received forward info " << *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 {
     if (new_message->forward_info != nullptr) {
-      if (*old_message->forward_info != *new_message->forward_info &&
-          (!old_message->forward_info->sender_user_id.is_valid() ||
-           new_message->forward_info->sender_user_id.is_valid())) {
+      if (old_message->forward_info->author_signature != new_message->forward_info->author_signature) {
         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
-            << ", message content type is " << old_message->content->get_type() << '/'
-            << new_message->content->get_type();
+        is_changed = true;
+      }
+      if (*old_message->forward_info != *new_message->forward_info) {
+        LOG(ERROR) << 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 << ", 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;
       }
-      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 "