From a14091ff8171c4a8590fe47d9543e921b0667af0 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 24 Jan 2024 20:03:42 +0300
Subject: [PATCH] Improve LastForwardedMessageInfo logging.

---
 td/telegram/MessageForwardInfo.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/td/telegram/MessageForwardInfo.cpp b/td/telegram/MessageForwardInfo.cpp
index f3b112160..1534d4572 100644
--- a/td/telegram/MessageForwardInfo.cpp
+++ b/td/telegram/MessageForwardInfo.cpp
@@ -105,10 +105,17 @@ StringBuilder &operator<<(StringBuilder &string_builder, const LastForwardedMess
   if (!last_message_info.is_empty()) {
     string_builder << MessageFullId(last_message_info.dialog_id_, last_message_info.message_id_);
     if (last_message_info.sender_dialog_id_ != DialogId() || !last_message_info.sender_name_.empty()) {
-      string_builder << " sent by " << last_message_info.sender_dialog_id_ << '/' << last_message_info.sender_name_;
-      if (last_message_info.is_outgoing_) {
-        string_builder << " (me)";
+      string_builder << " sent by ";
+      if (last_message_info.sender_dialog_id_.is_valid()) {
+        string_builder << last_message_info.sender_dialog_id_;
       }
+      if (!last_message_info.sender_name_.empty()) {
+        if (last_message_info.sender_dialog_id_.is_valid()) {
+          string_builder << '/';
+        }
+        string_builder << '"' << last_message_info.sender_name_ << '"';
+      }
+      string_builder << (last_message_info.is_outgoing_ ? " (me)" : " (not me)");
     }
     if (last_message_info.date_ != 0) {
       string_builder << " at " << last_message_info.date_;