From f13a2517cd1441afdf6c1a4f6bbfbd132d848d14 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 1 Nov 2022 16:54:54 +0400 Subject: [PATCH] Topic Author badge only if not admin. --- .../history/view/history_view_message.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp index f961a39db1..265e8ed417 100644 --- a/Telegram/SourceFiles/history/view/history_view_message.cpp +++ b/Telegram/SourceFiles/history/view/history_view_message.cpp @@ -329,10 +329,7 @@ not_null Message::message() const { void Message::refreshRightBadge() { const auto text = [&] { - const auto author = delegate()->elementAuthorRank(this); - if (!author.isEmpty()) { - return author; - } else if (data()->isDiscussionPost()) { + if (data()->isDiscussionPost()) { return (delegate()->elementContext() == Context::Replies) ? QString() : tr::lng_channel_badge(tr::now); @@ -362,12 +359,13 @@ void Message::refreshRightBadge() { ? tr::lng_admin_badge(tr::now) : QString(); }(); - if (text.isEmpty()) { + const auto badge = text.isEmpty() + ? delegate()->elementAuthorRank(this) + : TextUtilities::RemoveEmoji(TextUtilities::SingleLine(text)); + if (badge.isEmpty()) { _rightBadge.clear(); } else { - _rightBadge.setText( - st::defaultTextStyle, - TextUtilities::RemoveEmoji(TextUtilities::SingleLine(text))); + _rightBadge.setText(st::defaultTextStyle, badge); } }