From 894e7c5828f47e2d99918ab805f6067c6d6210a1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 1 Dec 2021 18:52:16 +0400 Subject: [PATCH] Fix imported messages without a sender name. --- Telegram/SourceFiles/history/history_item_components.cpp | 2 ++ Telegram/SourceFiles/history/history_message.cpp | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index 9f1327872c..86aff74bfe 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -135,6 +135,8 @@ HiddenSenderInfo::HiddenSenderInfo(const QString &name, bool external) (external ? Ui::EmptyUserpic::ExternalName() : name)) { + Expects(!name.isEmpty()); + nameText.setText(st::msgNameStyle, name, Ui::NameTextOptions()); const auto parts = name.trimmed().split(' ', Qt::SkipEmptyParts); firstName = parts[0]; diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp index ab8c7f616e..12c250fd87 100644 --- a/Telegram/SourceFiles/history/history_message.cpp +++ b/Telegram/SourceFiles/history/history_message.cpp @@ -1176,8 +1176,13 @@ void HistoryMessage::setupForwardedComponent(const CreateConfig &config) { return; } forwarded->originalDate = config.originalDate; - forwarded->originalSender = config.senderOriginal - ? history()->owner().peer(config.senderOriginal).get() + const auto originalSender = config.senderOriginal + ? config.senderOriginal + : !config.senderNameOriginal.isEmpty() + ? PeerId() + : from()->id; + forwarded->originalSender = originalSender + ? history()->owner().peer(originalSender).get() : nullptr; if (!forwarded->originalSender) { forwarded->hiddenSenderInfo = std::make_unique(