From e1aa08b9858372e631aa46a5e452c2177fd06b7c Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 7 Jan 2022 02:04:26 +0300 Subject: [PATCH] Removed text commands. --- Telegram/SourceFiles/api/api_text_entities.cpp | 4 ++-- .../SourceFiles/boxes/background_preview_box.cpp | 2 +- Telegram/SourceFiles/data/data_media_types.cpp | 4 ++-- Telegram/SourceFiles/data/data_session.cpp | 8 ++++---- Telegram/SourceFiles/data/data_web_page.cpp | 13 +++++-------- Telegram/SourceFiles/dialogs/dialogs_row.cpp | 2 +- .../history/admin_log/history_admin_log_inner.cpp | 2 +- .../history/admin_log/history_admin_log_item.cpp | 4 ++-- Telegram/SourceFiles/history/history_message.cpp | 2 +- Telegram/SourceFiles/history/history_widget.cpp | 4 ++-- .../view/controls/history_view_compose_controls.cpp | 2 +- .../history/view/media/history_view_location.cpp | 4 ++-- .../SourceFiles/support/support_autocomplete.cpp | 2 +- Telegram/SourceFiles/window/window_lock_widgets.cpp | 2 +- 14 files changed, 26 insertions(+), 29 deletions(-) diff --git a/Telegram/SourceFiles/api/api_text_entities.cpp b/Telegram/SourceFiles/api/api_text_entities.cpp index 45f13882c0..9b9d5e5ee7 100644 --- a/Telegram/SourceFiles/api/api_text_entities.cpp +++ b/Telegram/SourceFiles/api/api_text_entities.cpp @@ -27,7 +27,7 @@ EntitiesInText EntitiesFromMTP( for (const auto &entity : entities) { 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_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_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; @@ -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_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_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_messageEntitySpoiler: { auto &d = entity.c_messageEntitySpoiler(); result.push_back({ EntityType::Spoiler, d.voffset().v, d.vlength().v }); } break; // #TODO entities diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp index 6ced45f9f3..448828f0ad 100644 --- a/Telegram/SourceFiles/boxes/background_preview_box.cpp +++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp @@ -302,7 +302,7 @@ bool ServiceCheck::checkRippleStartPosition(QPoint position) const { base::unixtime::now(), out ? history->session().userId() : peerToUser(history->peer->id), QString(), - TextWithEntities{ TextUtilities::Clean(text) }, + TextWithEntities{ text }, MTP_messageMediaEmpty(), HistoryMessageMarkupData(), groupedId); diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp index a8bf37becf..a2955ec23e 100644 --- a/Telegram/SourceFiles/data/data_media_types.cpp +++ b/Telegram/SourceFiles/data/data_media_types.cpp @@ -1113,10 +1113,10 @@ TextForMimeData MediaLocation::clipboardText() const { auto result = TextForMimeData::Simple( qstr("[ ") + tr::lng_maps_point(tr::now) + qstr(" ]\n")); auto titleResult = TextUtilities::ParseEntities( - TextUtilities::Clean(_title), + _title, Ui::WebpageTextTitleOptions().flags); auto descriptionResult = TextUtilities::ParseEntities( - TextUtilities::Clean(_description), + _description, TextParseLinks | TextParseMultiline | TextParseRichText); if (!titleResult.empty()) { result.append(std::move(titleResult)); diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 36a1c25e03..f8832c660e 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -3015,8 +3015,8 @@ not_null Session::webpage( void Session::webpageApplyFields( not_null page, const MTPDwebPage &data) { - auto description = TextWithEntities { - TextUtilities::Clean(qs(data.vdescription().value_or_empty())) + auto description = TextWithEntities{ + qs(data.vdescription().value_or_empty()) }; const auto siteName = qs(data.vsite_name().value_or_empty()); auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText; @@ -3191,9 +3191,9 @@ void Session::gameApplyFields( return; } game->accessHash = accessHash; - game->shortName = TextUtilities::Clean(shortName); + game->shortName = shortName; game->title = TextUtilities::SingleLine(title); - game->description = TextUtilities::Clean(description); + game->description = description; game->photo = photo; game->document = document; notifyGameUpdateDelayed(game); diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp index eac5343059..99b8439f24 100644 --- a/Telegram/SourceFiles/data/data_web_page.cpp +++ b/Telegram/SourceFiles/data/data_web_page.cpp @@ -221,14 +221,11 @@ bool WebPageData::applyChanges( return false; } - const auto resultUrl = TextUtilities::Clean(newUrl); - const auto resultDisplayUrl = TextUtilities::Clean( - newDisplayUrl); - const auto possibleSiteName = TextUtilities::Clean( - newSiteName); - const auto resultTitle = TextUtilities::SingleLine( - newTitle); - const auto resultAuthor = TextUtilities::Clean(newAuthor); + const auto resultUrl = newUrl; + const auto resultDisplayUrl = newDisplayUrl; + const auto possibleSiteName = newSiteName; + const auto resultTitle = TextUtilities::SingleLine(newTitle); + const auto resultAuthor = newAuthor; const auto viewTitleText = resultTitle.isEmpty() ? TextUtilities::SingleLine(resultAuthor) diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp index 8c84f930a8..4b77dfc2d2 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp @@ -40,7 +40,7 @@ namespace { list.size() - (throwAwayLastName ? 1 : 0) ); const auto wrapName = [](not_null history) { - const auto name = TextUtilities::Clean(history->peer->name); + const auto name = history->peer->name; return TextWithEntities{ .text = name, .entities = (history->unreadCount() > 0) diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp index 6ce68c3da3..edfb960c3d 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp @@ -515,7 +515,7 @@ void InnerWidget::updateEmptyText() { ? tr::lng_admin_log_no_results_search_text( tr::now, lt_query, - TextUtilities::Clean(_searchQuery)) + _searchQuery) : hasFilter ? tr::lng_admin_log_no_results_text(tr::now) : _channel->isMegagroup() diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp index 457b465d55..797b2719d9 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp @@ -35,7 +35,7 @@ namespace { TextWithEntities PrepareText( const QString &value, const QString &emptyValue) { - auto result = TextWithEntities { TextUtilities::Clean(value) }; + auto result = TextWithEntities{ value }; if (result.text.isEmpty()) { result.text = emptyValue; if (!emptyValue.isEmpty()) { @@ -143,7 +143,7 @@ TextWithEntities ExtractEditedText( } const auto &data = message.c_message(); return { - TextUtilities::Clean(qs(data.vmessage())), + qs(data.vmessage()), Api::EntitiesFromMTP(session, data.ventities().value_or_empty()) }; } diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp index bce048a8b6..a2400f2b60 100644 --- a/Telegram/SourceFiles/history/history_message.cpp +++ b/Telegram/SourceFiles/history/history_message.cpp @@ -501,7 +501,7 @@ HistoryMessage::HistoryMessage( setMedia(*media); } const auto textWithEntities = TextWithEntities{ - TextUtilities::Clean(qs(data.vmessage())), + qs(data.vmessage()), Api::EntitiesFromMTP( &history->session(), data.ventities().value_or_empty()) diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 40e47cd275..726cd0dd56 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -6706,7 +6706,7 @@ void HistoryWidget::updatePreview() { auto linkText = QStringView(_previewLinks).split(' ').at(0).toString(); _previewDescription.setText( st::messageTextStyle, - TextUtilities::Clean(linkText), + linkText, Ui::DialogTextOptions()); const auto timeout = (_previewData->pendingTill - base::unixtime::now()); @@ -6727,7 +6727,7 @@ void HistoryWidget::updatePreview() { Ui::NameTextOptions()); _previewDescription.setText( st::messageTextStyle, - TextUtilities::Clean(preview.description), + preview.description, Ui::DialogTextOptions()); } } else if (!readyToForward() && !replyToId() && !_editMsgId) { diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index 5608234d2a..7377d321f1 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -276,7 +276,7 @@ void FieldHeader::init() { ) | rpl::start_with_next([=](const auto &d) { _preview.description.setText( st::messageTextStyle, - TextUtilities::Clean(d), + d, Ui::DialogTextOptions()); }, lifetime()); diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp index cc80266ec3..f96adbdff6 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp @@ -38,14 +38,14 @@ Location::Location( if (!title.isEmpty()) { _title.setText( st::webPageTitleStyle, - TextUtilities::Clean(title), + title, Ui::WebpageTextTitleOptions()); } if (!description.isEmpty()) { _description.setMarkedText( st::webPageDescriptionStyle, TextUtilities::ParseEntities( - TextUtilities::Clean(description), + description, TextParseLinks | TextParseMultiline | TextParseRichText), Ui::WebpageTextDescriptionOptions()); } diff --git a/Telegram/SourceFiles/support/support_autocomplete.cpp b/Telegram/SourceFiles/support/support_autocomplete.cpp index 1faf4fbf9f..7d09a954f0 100644 --- a/Telegram/SourceFiles/support/support_autocomplete.cpp +++ b/Telegram/SourceFiles/support/support_autocomplete.cpp @@ -286,7 +286,7 @@ AdminLog::OwnedItem GenerateCommentItem( base::unixtime::now(), history->session().userId(), QString(), - TextWithEntities{ TextUtilities::Clean(data.comment) }, + TextWithEntities{ data.comment }, MTP_messageMediaEmpty(), HistoryMessageMarkupData(), groupedId); diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp index d13581ec3b..510caf4d0f 100644 --- a/Telegram/SourceFiles/window/window_lock_widgets.cpp +++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp @@ -197,7 +197,7 @@ TermsLock TermsLock::FromMTP( return { bytes::make_vector(data.vid().c_dataJSON().vdata().v), TextWithEntities { - TextUtilities::Clean(qs(data.vtext())), + qs(data.vtext()), Api::EntitiesFromMTP(session, data.ventities().v) }, (minAge ? std::make_optional(minAge->v) : std::nullopt), data.is_popup()