void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added userpic views to headers of forwarded messages.

Browse source
This commit is contained in:
23rd 2024-05-27 16:28:03 +03:00 • committed by John Preston
parent 470b3a2cbd
commit 8a6b1677f4
6 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Telegram/SourceFiles/history/history_item_components.cpp
View file

@ -183,8 +183,11 @@ bool HiddenSenderInfo::paintCustomUserpic(
return valid; return valid;
} }
void HistoryMessageForwarded::create(const HistoryMessageVia *via) const { void HistoryMessageForwarded::create(
const HistoryMessageVia *via,
not_null<const HistoryItem*> item) const {
auto phrase = TextWithEntities(); auto phrase = TextWithEntities();
auto context = Core::MarkedTextContext{};
const auto fromChannel = originalSender const auto fromChannel = originalSender
&& originalSender->isChannel() && originalSender->isChannel()
&& !originalSender->isMegagroup(); && !originalSender->isMegagroup();
@ -193,16 +196,27 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
? originalSender->name() ? originalSender->name()
: originalHiddenSenderInfo->name) : originalHiddenSenderInfo->name)
}; };
if (originalSender) {
context.session = &originalSender->owner().session();
context.customEmojiRepaint = [=] {
originalSender->owner().requestItemRepaint(item);
};
phrase = Ui::Text::SingleCustomEmoji(
context.session->data().customEmojiManager().peerUserpicEmojiData(
originalSender,
st::fwdTextUserpicPadding));
}
if (!originalPostAuthor.isEmpty()) { if (!originalPostAuthor.isEmpty()) {
phrase = tr::lng_forwarded_signed( phrase.append(
tr::now, tr::lng_forwarded_signed(
lt_channel, tr::now,
name, lt_channel,
lt_user, name,
{ .text = originalPostAuthor }, lt_user,
Ui::Text::WithEntities); { .text = originalPostAuthor },
Ui::Text::WithEntities));
} else { } else {
phrase = name; phrase.append(name);
} }
if (story) { if (story) {
phrase = tr::lng_forwarded_story( phrase = tr::lng_forwarded_story(
@ -248,18 +262,21 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
: tr::lng_forwarded_psa_default)( : tr::lng_forwarded_psa_default)(
tr::now, tr::now,
lt_channel, lt_channel,
Ui::Text::Link(phrase.text, QString()), // Link 1. Ui::Text::Wrapped(
phrase,
EntityType::CustomUrl,
QString()), // Link 1.
Ui::Text::WithEntities); Ui::Text::WithEntities);
} }
} else { } else {
phrase = tr::lng_forwarded( phrase = tr::lng_forwarded(
tr::now, tr::now,
lt_user, lt_user,
Ui::Text::Link(phrase.text, QString()), // Link 1. Ui::Text::Wrapped(phrase, EntityType::CustomUrl, QString()), // Link 1.
Ui::Text::WithEntities); Ui::Text::WithEntities);
} }
} }
text.setMarkedText(st::fwdTextStyle, phrase); text.setMarkedText(st::fwdTextStyle, phrase, kMarkupTextOptions, context);
text.setLink(1, fromChannel text.setLink(1, fromChannel
? JumpToMessageClickHandler(originalSender, originalId) ? JumpToMessageClickHandler(originalSender, originalId)

4
Telegram/SourceFiles/history/history_item_components.h
View file

@ -125,7 +125,9 @@ private:
}; };
struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded, HistoryItem> { struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded, HistoryItem> {
void create(const HistoryMessageVia *via) const; void create(
const HistoryMessageVia *via,
not_null<const HistoryItem*> item) const;
[[nodiscard]] bool forwardOfForward() const { [[nodiscard]] bool forwardOfForward() const {
return savedFromSender || savedFromHiddenSenderInfo; return savedFromSender || savedFromHiddenSenderInfo;

2
Telegram/SourceFiles/history/view/history_view_message.cpp
View file

@ -714,7 +714,7 @@ QSize Message::performCountOptimalSize() {
const auto via = item->Get<HistoryMessageVia>(); const auto via = item->Get<HistoryMessageVia>();
const auto entry = logEntryOriginal(); const auto entry = logEntryOriginal();
if (forwarded) { if (forwarded) {
forwarded->create(via); forwarded->create(via, item);
} }
auto mediaDisplayed = false; auto mediaDisplayed = false;

2
Telegram/SourceFiles/history/view/media/history_view_gif.cpp
View file

@ -293,7 +293,7 @@ QSize Gif::countOptimalSize() {
auto reply = _parent->Get<Reply>(); auto reply = _parent->Get<Reply>();
auto forwarded = item->Get<HistoryMessageForwarded>(); auto forwarded = item->Get<HistoryMessageForwarded>();
if (forwarded) { if (forwarded) {
forwarded->create(via); forwarded->create(via, item);
} }
maxWidth += additionalWidth(reply, via, forwarded); maxWidth += additionalWidth(reply, via, forwarded);
accumulate_max(maxWidth, _parent->reactionsOptimalWidth()); accumulate_max(maxWidth, _parent->reactionsOptimalWidth());

2
Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
View file

@ -59,7 +59,7 @@ QSize UnwrappedMedia::countOptimalSize() {
const auto topic = _parent->displayedTopicButton(); const auto topic = _parent->displayedTopicButton();
const auto forwarded = getDisplayedForwardedInfo(); const auto forwarded = getDisplayedForwardedInfo();
if (forwarded) { if (forwarded) {
forwarded->create(via); forwarded->create(via, item);
} }
maxWidth += additionalWidth(topic, reply, via, forwarded); maxWidth += additionalWidth(topic, reply, via, forwarded);
accumulate_max(maxWidth, _parent->reactionsOptimalWidth()); accumulate_max(maxWidth, _parent->reactionsOptimalWidth());

1
Telegram/SourceFiles/ui/chat/chat.style
View file

@ -125,6 +125,7 @@ outTextPaletteSelected: TextPalette(outTextPalette) {
monoFg: msgOutMonoFgSelected; monoFg: msgOutMonoFgSelected;
spoilerFg: msgOutDateFgSelected; spoilerFg: msgOutDateFgSelected;
} }
fwdTextUserpicPadding: margins(0px, 1px, 3px, 0px);
fwdTextStyle: TextStyle(semiboldTextStyle) { fwdTextStyle: TextStyle(semiboldTextStyle) {
linkUnderline: kLinkUnderlineNever; linkUnderline: kLinkUnderlineNever;
} }