Don't show "You:" in private chats.
This commit is contained in:
parent
24e0ea2a59
commit
2ca5f26546
|
@ -952,28 +952,34 @@ ItemPreview HistoryItem::toPreview(ToPreviewOptions options) const {
|
||||||
}
|
}
|
||||||
return {};
|
return {};
|
||||||
}();
|
}();
|
||||||
const auto sender = [&]() -> PeerData* {
|
const auto sender = [&]() -> std::optional<QString> {
|
||||||
|
const auto fromSender = [](not_null<PeerData*> sender) {
|
||||||
|
return sender->isSelf()
|
||||||
|
? tr::lng_from_you(tr::now)
|
||||||
|
: sender->shortName();
|
||||||
|
};
|
||||||
if (options.hideSender || isPost() || isEmpty()) {
|
if (options.hideSender || isPost() || isEmpty()) {
|
||||||
return nullptr;
|
return {};
|
||||||
} else if (!_history->peer->isUser() || out()) {
|
} else if (!_history->peer->isUser()) {
|
||||||
return displayFrom();
|
return fromSender(displayFrom());
|
||||||
} else if (_history->peer->isSelf() && !Has<HistoryMessageForwarded>()) {
|
} else if (_history->peer->isSelf()) {
|
||||||
return senderOriginal();
|
if (const auto forwarded = Get<HistoryMessageForwarded>()) {
|
||||||
|
return forwarded->originalSender
|
||||||
|
? fromSender(forwarded->originalSender)
|
||||||
|
: forwarded->hiddenSenderInfo->name;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nullptr;
|
return {};
|
||||||
}();
|
}();
|
||||||
if (!sender) {
|
if (!sender) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
const auto fromText = sender->isSelf()
|
|
||||||
? tr::lng_from_you(tr::now)
|
|
||||||
: sender->shortName();
|
|
||||||
const auto fromWrapped = textcmdLink(
|
const auto fromWrapped = textcmdLink(
|
||||||
1,
|
1,
|
||||||
tr::lng_dialogs_text_from_wrapped(
|
tr::lng_dialogs_text_from_wrapped(
|
||||||
tr::now,
|
tr::now,
|
||||||
lt_from,
|
lt_from,
|
||||||
TextUtilities::Clean(fromText)));
|
TextUtilities::Clean(*sender)));
|
||||||
return Dialogs::Ui::PreviewWithSender(std::move(result), fromWrapped);
|
return Dialogs::Ui::PreviewWithSender(std::move(result), fromWrapped);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue