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

Removed text commands.

Browse source
This commit is contained in:
23rd 2022-01-07 02:04:26 +03:00 • committed by John Preston
parent 2af3770b29
commit e1aa08b985
14 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/api/api_text_entities.cpp
View file

@ -27,7 +27,7 @@ EntitiesInText EntitiesFromMTP(
for (const auto &entity : entities) { for (const auto &entity : entities) {
switch (entity.type()) { switch (entity.type()) {
case mtpc_messageEntityUrl: { auto &d = entity.c_messageEntityUrl(); result.push_back({ EntityType::Url, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntityUrl: { auto &d = entity.c_messageEntityUrl(); result.push_back({ EntityType::Url, d.voffset().v, d.vlength().v }); } break;
case mtpc_messageEntityTextUrl: { auto &d = entity.c_messageEntityTextUrl(); result.push_back({ EntityType::CustomUrl, d.voffset().v, d.vlength().v, Clean(qs(d.vurl())) }); } break; case mtpc_messageEntityTextUrl: { auto &d = entity.c_messageEntityTextUrl(); result.push_back({ EntityType::CustomUrl, d.voffset().v, d.vlength().v, qs(d.vurl()) }); } break;
case mtpc_messageEntityEmail: { auto &d = entity.c_messageEntityEmail(); result.push_back({ EntityType::Email, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntityEmail: { auto &d = entity.c_messageEntityEmail(); result.push_back({ EntityType::Email, d.voffset().v, d.vlength().v }); } break;
case mtpc_messageEntityHashtag: { auto &d = entity.c_messageEntityHashtag(); result.push_back({ EntityType::Hashtag, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntityHashtag: { auto &d = entity.c_messageEntityHashtag(); result.push_back({ EntityType::Hashtag, d.voffset().v, d.vlength().v }); } break;
case mtpc_messageEntityCashtag: { auto &d = entity.c_messageEntityCashtag(); result.push_back({ EntityType::Cashtag, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntityCashtag: { auto &d = entity.c_messageEntityCashtag(); result.push_back({ EntityType::Cashtag, d.voffset().v, d.vlength().v }); } break;
@ -71,7 +71,7 @@ EntitiesInText EntitiesFromMTP(
case mtpc_messageEntityUnderline: { auto &d = entity.c_messageEntityUnderline(); result.push_back({ EntityType::Underline, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntityUnderline: { auto &d = entity.c_messageEntityUnderline(); result.push_back({ EntityType::Underline, d.voffset().v, d.vlength().v }); } break;
case mtpc_messageEntityStrike: { auto &d = entity.c_messageEntityStrike(); result.push_back({ EntityType::StrikeOut, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntityStrike: { auto &d = entity.c_messageEntityStrike(); result.push_back({ EntityType::StrikeOut, d.voffset().v, d.vlength().v }); } break;
case mtpc_messageEntityCode: { auto &d = entity.c_messageEntityCode(); result.push_back({ EntityType::Code, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntityCode: { auto &d = entity.c_messageEntityCode(); result.push_back({ EntityType::Code, d.voffset().v, d.vlength().v }); } break;
case mtpc_messageEntityPre: { auto &d = entity.c_messageEntityPre(); result.push_back({ EntityType::Pre, d.voffset().v, d.vlength().v, Clean(qs(d.vlanguage())) }); } break; case mtpc_messageEntityPre: { auto &d = entity.c_messageEntityPre(); result.push_back({ EntityType::Pre, d.voffset().v, d.vlength().v, qs(d.vlanguage()) }); } break;
case mtpc_messageEntityBankCard: break; // Skipping cards. case mtpc_messageEntityBankCard: break; // Skipping cards.
case mtpc_messageEntitySpoiler: { auto &d = entity.c_messageEntitySpoiler(); result.push_back({ EntityType::Spoiler, d.voffset().v, d.vlength().v }); } break; case mtpc_messageEntitySpoiler: { auto &d = entity.c_messageEntitySpoiler(); result.push_back({ EntityType::Spoiler, d.voffset().v, d.vlength().v }); } break;
// #TODO entities // #TODO entities

2
Telegram/SourceFiles/boxes/background_preview_box.cpp
View file

@ -302,7 +302,7 @@ bool ServiceCheck::checkRippleStartPosition(QPoint position) const {
base::unixtime::now(), base::unixtime::now(),
out ? history->session().userId() : peerToUser(history->peer->id), out ? history->session().userId() : peerToUser(history->peer->id),
QString(), QString(),
TextWithEntities{ TextUtilities::Clean(text) }, TextWithEntities{ text },
MTP_messageMediaEmpty(), MTP_messageMediaEmpty(),
HistoryMessageMarkupData(), HistoryMessageMarkupData(),
groupedId); groupedId);

4
Telegram/SourceFiles/data/data_media_types.cpp
View file

@ -1113,10 +1113,10 @@ TextForMimeData MediaLocation::clipboardText() const {
auto result = TextForMimeData::Simple( auto result = TextForMimeData::Simple(
qstr("[ ") + tr::lng_maps_point(tr::now) + qstr(" ]\n")); qstr("[ ") + tr::lng_maps_point(tr::now) + qstr(" ]\n"));
auto titleResult = TextUtilities::ParseEntities( auto titleResult = TextUtilities::ParseEntities(
TextUtilities::Clean(_title), _title,
Ui::WebpageTextTitleOptions().flags); Ui::WebpageTextTitleOptions().flags);
auto descriptionResult = TextUtilities::ParseEntities( auto descriptionResult = TextUtilities::ParseEntities(
TextUtilities::Clean(_description), _description,
TextParseLinks | TextParseMultiline | TextParseRichText); TextParseLinks | TextParseMultiline | TextParseRichText);
if (!titleResult.empty()) { if (!titleResult.empty()) {
result.append(std::move(titleResult)); result.append(std::move(titleResult));

8
Telegram/SourceFiles/data/data_session.cpp
View file

@ -3015,8 +3015,8 @@ not_null<WebPageData*> Session::webpage(
void Session::webpageApplyFields( void Session::webpageApplyFields(
not_null<WebPageData*> page, not_null<WebPageData*> page,
const MTPDwebPage &data) { const MTPDwebPage &data) {
auto description = TextWithEntities { auto description = TextWithEntities{
TextUtilities::Clean(qs(data.vdescription().value_or_empty())) qs(data.vdescription().value_or_empty())
}; };
const auto siteName = qs(data.vsite_name().value_or_empty()); const auto siteName = qs(data.vsite_name().value_or_empty());
auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText; auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
@ -3191,9 +3191,9 @@ void Session::gameApplyFields(
return; return;
} }
game->accessHash = accessHash; game->accessHash = accessHash;
game->shortName = TextUtilities::Clean(shortName); game->shortName = shortName;
game->title = TextUtilities::SingleLine(title); game->title = TextUtilities::SingleLine(title);
game->description = TextUtilities::Clean(description); game->description = description;
game->photo = photo; game->photo = photo;
game->document = document; game->document = document;
notifyGameUpdateDelayed(game); notifyGameUpdateDelayed(game);

13
Telegram/SourceFiles/data/data_web_page.cpp
View file

@ -221,14 +221,11 @@ bool WebPageData::applyChanges(
return false; return false;
} }
const auto resultUrl = TextUtilities::Clean(newUrl); const auto resultUrl = newUrl;
const auto resultDisplayUrl = TextUtilities::Clean( const auto resultDisplayUrl = newDisplayUrl;
newDisplayUrl); const auto possibleSiteName = newSiteName;
const auto possibleSiteName = TextUtilities::Clean( const auto resultTitle = TextUtilities::SingleLine(newTitle);
newSiteName); const auto resultAuthor = newAuthor;
const auto resultTitle = TextUtilities::SingleLine(
newTitle);
const auto resultAuthor = TextUtilities::Clean(newAuthor);
const auto viewTitleText = resultTitle.isEmpty() const auto viewTitleText = resultTitle.isEmpty()
? TextUtilities::SingleLine(resultAuthor) ? TextUtilities::SingleLine(resultAuthor)

2
Telegram/SourceFiles/dialogs/dialogs_row.cpp
View file

@ -40,7 +40,7 @@ namespace {
list.size() - (throwAwayLastName ? 1 : 0) list.size() - (throwAwayLastName ? 1 : 0)
); );
const auto wrapName = [](not_null<History*> history) { const auto wrapName = [](not_null<History*> history) {
const auto name = TextUtilities::Clean(history->peer->name); const auto name = history->peer->name;
return TextWithEntities{ return TextWithEntities{
.text = name, .text = name,
.entities = (history->unreadCount() > 0) .entities = (history->unreadCount() > 0)

2
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View file

@ -515,7 +515,7 @@ void InnerWidget::updateEmptyText() {
? tr::lng_admin_log_no_results_search_text( ? tr::lng_admin_log_no_results_search_text(
tr::now, tr::now,
lt_query, lt_query,
TextUtilities::Clean(_searchQuery)) _searchQuery)
: hasFilter : hasFilter
? tr::lng_admin_log_no_results_text(tr::now) ? tr::lng_admin_log_no_results_text(tr::now)
: _channel->isMegagroup() : _channel->isMegagroup()

4
Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
View file

@ -35,7 +35,7 @@ namespace {
TextWithEntities PrepareText( TextWithEntities PrepareText(
const QString &value, const QString &value,
const QString &emptyValue) { const QString &emptyValue) {
auto result = TextWithEntities { TextUtilities::Clean(value) }; auto result = TextWithEntities{ value };
if (result.text.isEmpty()) { if (result.text.isEmpty()) {
result.text = emptyValue; result.text = emptyValue;
if (!emptyValue.isEmpty()) { if (!emptyValue.isEmpty()) {
@ -143,7 +143,7 @@ TextWithEntities ExtractEditedText(
} }
const auto &data = message.c_message(); const auto &data = message.c_message();
return { return {
TextUtilities::Clean(qs(data.vmessage())), qs(data.vmessage()),
Api::EntitiesFromMTP(session, data.ventities().value_or_empty()) Api::EntitiesFromMTP(session, data.ventities().value_or_empty())
}; };
} }

2
Telegram/SourceFiles/history/history_message.cpp
View file

@ -501,7 +501,7 @@ HistoryMessage::HistoryMessage(
setMedia(*media); setMedia(*media);
} }
const auto textWithEntities = TextWithEntities{ const auto textWithEntities = TextWithEntities{
TextUtilities::Clean(qs(data.vmessage())), qs(data.vmessage()),
Api::EntitiesFromMTP( Api::EntitiesFromMTP(
&history->session(), &history->session(),
data.ventities().value_or_empty()) data.ventities().value_or_empty())

4
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -6706,7 +6706,7 @@ void HistoryWidget::updatePreview() {
auto linkText = QStringView(_previewLinks).split(' ').at(0).toString(); auto linkText = QStringView(_previewLinks).split(' ').at(0).toString();
_previewDescription.setText( _previewDescription.setText(
st::messageTextStyle, st::messageTextStyle,
TextUtilities::Clean(linkText), linkText,
Ui::DialogTextOptions()); Ui::DialogTextOptions());
const auto timeout = (_previewData->pendingTill - base::unixtime::now()); const auto timeout = (_previewData->pendingTill - base::unixtime::now());
@ -6727,7 +6727,7 @@ void HistoryWidget::updatePreview() {
Ui::NameTextOptions()); Ui::NameTextOptions());
_previewDescription.setText( _previewDescription.setText(
st::messageTextStyle, st::messageTextStyle,
TextUtilities::Clean(preview.description), preview.description,
Ui::DialogTextOptions()); Ui::DialogTextOptions());
} }
} else if (!readyToForward() && !replyToId() && !_editMsgId) { } else if (!readyToForward() && !replyToId() && !_editMsgId) {

2
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
View file

@ -276,7 +276,7 @@ void FieldHeader::init() {
) | rpl::start_with_next([=](const auto &d) { ) | rpl::start_with_next([=](const auto &d) {
_preview.description.setText( _preview.description.setText(
st::messageTextStyle, st::messageTextStyle,
TextUtilities::Clean(d), d,
Ui::DialogTextOptions()); Ui::DialogTextOptions());
}, lifetime()); }, lifetime());

4
Telegram/SourceFiles/history/view/media/history_view_location.cpp
View file

@ -38,14 +38,14 @@ Location::Location(
if (!title.isEmpty()) { if (!title.isEmpty()) {
_title.setText( _title.setText(
st::webPageTitleStyle, st::webPageTitleStyle,
TextUtilities::Clean(title), title,
Ui::WebpageTextTitleOptions()); Ui::WebpageTextTitleOptions());
} }
if (!description.isEmpty()) { if (!description.isEmpty()) {
_description.setMarkedText( _description.setMarkedText(
st::webPageDescriptionStyle, st::webPageDescriptionStyle,
TextUtilities::ParseEntities( TextUtilities::ParseEntities(
TextUtilities::Clean(description), description,
TextParseLinks | TextParseMultiline | TextParseRichText), TextParseLinks | TextParseMultiline | TextParseRichText),
Ui::WebpageTextDescriptionOptions()); Ui::WebpageTextDescriptionOptions());
} }

2
Telegram/SourceFiles/support/support_autocomplete.cpp
View file

@ -286,7 +286,7 @@ AdminLog::OwnedItem GenerateCommentItem(
base::unixtime::now(), base::unixtime::now(),
history->session().userId(), history->session().userId(),
QString(), QString(),
TextWithEntities{ TextUtilities::Clean(data.comment) }, TextWithEntities{ data.comment },
MTP_messageMediaEmpty(), MTP_messageMediaEmpty(),
HistoryMessageMarkupData(), HistoryMessageMarkupData(),
groupedId); groupedId);

2
Telegram/SourceFiles/window/window_lock_widgets.cpp
View file

@ -197,7 +197,7 @@ TermsLock TermsLock::FromMTP(
return { return {
bytes::make_vector(data.vid().c_dataJSON().vdata().v), bytes::make_vector(data.vid().c_dataJSON().vdata().v),
TextWithEntities { TextWithEntities {
TextUtilities::Clean(qs(data.vtext())), qs(data.vtext()),
Api::EntitiesFromMTP(session, data.ventities().v) }, Api::EntitiesFromMTP(session, data.ventities().v) },
(minAge ? std::make_optional(minAge->v) : std::nullopt), (minAge ? std::make_optional(minAge->v) : std::nullopt),
data.is_popup() data.is_popup()