void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-18 23:27:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Highlight internal links in Bio.

Browse source
This commit is contained in:
John Preston 2020-10-29 19:53:07 +03:00
parent 600cf83c3f
commit c35b6e1209
4 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/SourceFiles/info/profile/info_profile_actions.cpp
View file

@ -267,11 +267,10 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
tr::lng_info_mobile_label(),
PhoneOrHiddenValue(user),
tr::lng_profile_copy_phone(tr::now));
if (user->isBot()) {
addInfoLine(tr::lng_info_about_label(), AboutValue(user));
} else {
addInfoLine(tr::lng_info_bio_label(), BioValue(user));
}
auto label = user->isBot()
? tr::lng_info_about_label()
: tr::lng_info_bio_label();
addInfoLine(std::move(label), AboutValue(user));
addInfoOneLine(
tr::lng_info_username_label(),
UsernameValue(user),

71
Telegram/SourceFiles/info/profile/info_profile_values.cpp
View file

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "info/profile/info_profile_values.h"
#include "core/application.h"
#include "core/local_url_handlers.h"
#include "main/main_session.h"
#include "ui/wrap/slide_wrap.h"
#include "ui/text/text_utilities.h"
@ -29,12 +30,12 @@ namespace {
using UpdateFlag = Data::PeerUpdate::Flag;
auto PlainBioValue(not_null<UserData*> user) {
return user->session().changes().peerFlagsValue(
user,
auto PlainAboutValue(not_null<PeerData*> peer) {
return peer->session().changes().peerFlagsValue(
peer,
UpdateFlag::About
) | rpl::map([=] {
return user->about();
return peer->about();
});
}
@ -47,6 +48,24 @@ auto PlainUsernameValue(not_null<PeerData*> peer) {
});
}
void StripExternalLinks(TextWithEntities &text) {
const auto local = [](const QString &url) {
return Core::TryConvertUrlToLocal(url).startsWith(qstr("tg://"));
};
const auto notLocal = [&](const EntityInText &entity) {
if (entity.type() == EntityType::CustomUrl) {
return !local(entity.data());
} else if (entity.type() == EntityType::Url) {
return !local(text.text.mid(entity.offset(), entity.length()));
} else {
return false;
}
};
text.entities.erase(
ranges::remove_if(text.entities, notLocal),
text.entities.end());
}
} // namespace
rpl::producer<TextWithEntities> NameValue(not_null<PeerData*> peer) {
@ -71,25 +90,19 @@ rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user) {
return rpl::combine(
PhoneValue(user),
PlainUsernameValue(user),
PlainBioValue(user),
PlainAboutValue(user),
tr::lng_info_mobile_hidden()
) | rpl::map([](
const TextWithEntities &phone,
const QString &username,
const QString &bio,
const QString &about,
const QString &hidden) {
return (phone.text.isEmpty() && username.isEmpty() && bio.isEmpty())
return (phone.text.isEmpty() && username.isEmpty() && about.isEmpty())
? Ui::Text::WithEntities(hidden)
: phone;
});
}
rpl::producer<TextWithEntities> BioValue(not_null<UserData*> user) {
return PlainBioValue(user)
| ToSingleLine()
| Ui::Text::ToWithEntities();
}
rpl::producer<TextWithEntities> UsernameValue(not_null<UserData*> user) {
return PlainUsernameValue(
user
@ -100,32 +113,26 @@ rpl::producer<TextWithEntities> UsernameValue(not_null<UserData*> user) {
}) | Ui::Text::ToWithEntities();
}
rpl::producer<QString> PlainAboutValue(not_null<PeerData*> peer) {
if (const auto user = peer->asUser()) {
if (!user->isBot()) {
return rpl::single(QString());
}
}
return peer->session().changes().peerFlagsValue(
peer,
UpdateFlag::About
) | rpl::map([=] {
return peer->about();
});
}
rpl::producer<TextWithEntities> AboutValue(not_null<PeerData*> peer) {
auto flags = TextParseLinks
| TextParseMentions
| TextParseHashtags;
if (peer->isUser()) {
flags |= TextParseBotCommands;
auto flags = TextParseLinks | TextParseMentions;
const auto user = peer->asUser();
const auto isBot = user && user->isBot();
if (!user) {
flags |= TextParseHashtags;
} else if (isBot) {
flags |= TextParseHashtags | TextParseBotCommands;
}
const auto stripExternal = peer->isChat()
|| peer->isMegagroup()
|| (user && !isBot);
return PlainAboutValue(
peer
) | Ui::Text::ToWithEntities(
) | rpl::map([=](TextWithEntities &&text) {
TextUtilities::ParseEntities(text, flags);
if (stripExternal) {
StripExternalLinks(text);
}
return std::move(text);
});
}

1
Telegram/SourceFiles/info/profile/info_profile_values.h
View file

@ -37,7 +37,6 @@ rpl::producer<not_null<PeerData*>> MigratedOrMeValue(
rpl::producer<TextWithEntities> NameValue(not_null<PeerData*> peer);
rpl::producer<TextWithEntities> PhoneValue(not_null<UserData*> user);
rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user);
rpl::producer<TextWithEntities> BioValue(not_null<UserData*> user);
rpl::producer<TextWithEntities> UsernameValue(not_null<UserData*> user);
rpl::producer<TextWithEntities> AboutValue(not_null<PeerData*> peer);
rpl::producer<QString> LinkValue(not_null<PeerData*> peer);

2
Telegram/SourceFiles/settings/settings_information.cpp
View file

@ -346,7 +346,7 @@ BioManager SetupBio(
std::move(done));
};
Info::Profile::BioValue(
Info::Profile::AboutValue(
self
) | rpl::start_with_next([=](const TextWithEntities &text) {
const auto wasChanged = (*current != bio->getLastText());