RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix imported messages without a sender name.

This commit is contained in:
John Preston 2021-12-01 18:52:16 +04:00
parent afcebb136c
commit 894e7c5828
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/history/history_item_components.cpp
View File

@ -135,6 +135,8 @@ HiddenSenderInfo::HiddenSenderInfo(const QString &name, bool external)
(external (external
? Ui::EmptyUserpic::ExternalName() ? Ui::EmptyUserpic::ExternalName()
: name)) { : name)) {
Expects(!name.isEmpty());
nameText.setText(st::msgNameStyle, name, Ui::NameTextOptions()); nameText.setText(st::msgNameStyle, name, Ui::NameTextOptions());
const auto parts = name.trimmed().split(' ', Qt::SkipEmptyParts); const auto parts = name.trimmed().split(' ', Qt::SkipEmptyParts);
firstName = parts[0]; firstName = parts[0];

9
Telegram/SourceFiles/history/history_message.cpp
View File

@ -1176,8 +1176,13 @@ void HistoryMessage::setupForwardedComponent(const CreateConfig &config) {
return; return;
} }
forwarded->originalDate = config.originalDate; forwarded->originalDate = config.originalDate;
forwarded->originalSender = config.senderOriginal const auto originalSender = config.senderOriginal
? history()->owner().peer(config.senderOriginal).get() ? config.senderOriginal
: !config.senderNameOriginal.isEmpty()
? PeerId()
: from()->id;
forwarded->originalSender = originalSender
? history()->owner().peer(originalSender).get()
: nullptr; : nullptr;
if (!forwarded->originalSender) { if (!forwarded->originalSender) {
forwarded->hiddenSenderInfo = std::make_unique<HiddenSenderInfo>( forwarded->hiddenSenderInfo = std::make_unique<HiddenSenderInfo>(