Removed text commands from profile cover.

This commit is contained in:
23rd 2022-01-05 00:26:13 +03:00 committed by John Preston
parent 5b569718ec
commit d9147562e5
1 changed files with 12 additions and 9 deletions

View File

@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper #include "ui/text/text_utilities.h"
#include "ui/special_buttons.h" #include "ui/special_buttons.h"
#include "ui/unread_badge.h" #include "ui/unread_badge.h"
#include "base/unixtime.h" #include "base/unixtime.h"
@ -397,7 +397,8 @@ void Cover::refreshStatusText() {
} }
return false; return false;
}(); }();
auto statusText = [&] { auto statusText = [&]() -> TextWithEntities {
using namespace Ui::Text;
auto currentTime = base::unixtime::now(); auto currentTime = base::unixtime::now();
if (auto user = _peer->asUser()) { if (auto user = _peer->asUser()) {
const auto result = Data::OnlineTextFull(user, currentTime); const auto result = Data::OnlineTextFull(user, currentTime);
@ -407,27 +408,29 @@ void Cover::refreshStatusText() {
_refreshStatusTimer.callOnce(updateIn); _refreshStatusTimer.callOnce(updateIn);
} }
return showOnline return showOnline
? textcmdLink(1, result) ? PlainLink(result)
: result; : TextWithEntities{ .text = result };
} else if (auto chat = _peer->asChat()) { } else if (auto chat = _peer->asChat()) {
if (!chat->amIn()) { if (!chat->amIn()) {
return tr::lng_chat_status_unaccessible(tr::now); return tr::lng_chat_status_unaccessible({}, WithEntities);
} }
auto fullCount = std::max( auto fullCount = std::max(
chat->count, chat->count,
int(chat->participants.size())); int(chat->participants.size()));
return ChatStatusText(fullCount, _onlineCount, true); return { .text = ChatStatusText(fullCount, _onlineCount, true) };
} else if (auto channel = _peer->asChannel()) { } else if (auto channel = _peer->asChannel()) {
auto fullCount = qMax(channel->membersCount(), 1); auto fullCount = qMax(channel->membersCount(), 1);
auto result = ChatStatusText( auto result = ChatStatusText(
fullCount, fullCount,
_onlineCount, _onlineCount,
channel->isMegagroup()); channel->isMegagroup());
return hasMembersLink ? textcmdLink(1, result) : result; return hasMembersLink
? PlainLink(result)
: TextWithEntities{ .text = result };
} }
return tr::lng_chat_status_unaccessible(tr::now); return tr::lng_chat_status_unaccessible(tr::now, WithEntities);
}(); }();
_status->setRichText(statusText); _status->setMarkedText(statusText);
if (hasMembersLink) { if (hasMembersLink) {
_status->setLink(1, std::make_shared<LambdaClickHandler>([=] { _status->setLink(1, std::make_shared<LambdaClickHandler>([=] {
_showSection.fire(Section::Type::Members); _showSection.fire(Section::Type::Members);