From 2975dec8b9eea333479d83d57a2dd6d6ff273483 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Mon, 23 Aug 2021 00:58:01 +0300 Subject: [PATCH] Revert 'via @bot' tag option Context menu option is not reverted, because it could be useful, but global option causes confusion. --- Telegram/Resources/langs/lang.strings | 2 -- Telegram/Resources/langs/rewrites/en.json | 1 - Telegram/Resources/langs/rewrites/ru.json | 1 - Telegram/SourceFiles/inline_bots/inline_results_inner.cpp | 5 +---- Telegram/SourceFiles/kotato/json_settings.cpp | 6 ------ Telegram/SourceFiles/kotato/settings.cpp | 2 -- Telegram/SourceFiles/kotato/settings.h | 2 -- Telegram/SourceFiles/kotato/settings_menu.cpp | 5 ----- 8 files changed, 1 insertion(+), 23 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 9981b5a3d..bfd9e0bf3 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2950,8 +2950,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ktg_settings_external_video_player" = "External video player"; "ktg_settings_external_video_player_about" = "When this option is enabled, autoplay is force-disabled and system video player is used to play videos."; -"ktg_settings_hide_via" = "Send inline results without 'via @bot'"; - "ktg_user_status_unaccessible" = "account inaccessible"; "ktg_settings_show_json_settings" = "Show settings file"; diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json index b3ba73c5f..f6d6f3a3a 100644 --- a/Telegram/Resources/langs/rewrites/en.json +++ b/Telegram/Resources/langs/rewrites/en.json @@ -83,7 +83,6 @@ "ktg_settings_ffmpeg_multithread_about": "When enabled, CPU and RAM consumption is higher, video decodes faster. When disabled, CPU and RAM consumption is lower, video decodes slower. The more CPU cores you have, the more RAM consumption you have when this option is enabled. You can set exact number of threads in the JSON configuration file.", "ktg_settings_external_video_player": "External video player", "ktg_settings_external_video_player_about": "When this option is enabled, autoplay is force-disabled and system video player is used to play videos.", - "ktg_settings_hide_via": "Send inline results without 'via @bot'", "ktg_settings_adaptive_bubbles": "Adaptive bubbles", "ktg_settings_disable_sound_from_tray": "Disable sound", "ktg_settings_enable_sound_from_tray": "Enable sound", diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json index cf484a6e3..46fef6a23 100644 --- a/Telegram/Resources/langs/rewrites/ru.json +++ b/Telegram/Resources/langs/rewrites/ru.json @@ -83,7 +83,6 @@ "ktg_settings_ffmpeg_multithread_about": "Когда включено, расход ЦП и ОЗУ выше, видео декодируется быстрее. Когда выключено, расход ЦП и ОЗУ меньше, видео декодируется медленнее. Чем больше у вас ядер ЦП, тем больше расход ОЗУ, когда эта опция включена. Можно закрепить используемое число потоков в конфигурационном файле JSON.", "ktg_settings_external_video_player": "Внешний видеоплеер", "ktg_settings_external_video_player_about": "Когда эта опция включена, автовоспроизведение принудительно отключено и системный видеоплеер используется для проигрывания видео.", - "ktg_settings_hide_via": "Отправлять результаты ботов без 'через @bot'", "ktg_settings_adaptive_bubbles": "Адаптивная ширина сообщений", "ktg_settings_disable_sound_from_tray": "Отключить звук", "ktg_settings_enable_sound_from_tray": "Включить звук", diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp index 8481c4bcb..a568ddc03 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp @@ -248,7 +248,7 @@ void Inner::mouseReleaseEvent(QMouseEvent *e) { if (dynamic_cast(activated.get()) || open) { const auto row = int(_selected / MatrixRowShift); const auto column = int(_selected % MatrixRowShift); - selectInlineResult(row, column, { .hideVia = cHideVia() }, !!open); + selectInlineResult(row, column, {}, !!open); } else { ActivateClickHandler(window(), activated, e->button()); } @@ -308,9 +308,6 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) { _menu = base::make_unique_q(this); const auto send = [=](Api::SendOptions options) { - if (cHideVia()) { - options.hideVia = true; - } selectInlineResult(row, column, options, false); }; SendMenu::FillSendMenu( diff --git a/Telegram/SourceFiles/kotato/json_settings.cpp b/Telegram/SourceFiles/kotato/json_settings.cpp index ff036ff24..53c480de7 100644 --- a/Telegram/SourceFiles/kotato/json_settings.cpp +++ b/Telegram/SourceFiles/kotato/json_settings.cpp @@ -390,7 +390,6 @@ QByteArray GenerateSettingsJson(bool areDefault = false) { settings.insert(qsl("forward_retain_selection"), cForwardRetainSelection()); settings.insert(qsl("forward_on_click"), cForwardChatOnClick()); settings.insert(qsl("telegram_sites_autologin"), cTelegramSitesAutologin()); - settings.insert(qsl("hide_via"), cHideVia()); settingsFonts.insert(qsl("size"), cFontSize()); settingsFonts.insert(qsl("use_system_font"), cUseSystemFont()); @@ -972,11 +971,6 @@ bool Manager::readCustomFile() { ReadBoolOption(settings, "telegram_sites_autologin", [&](auto v) { cSetTelegramSitesAutologin(v); }); - - ReadBoolOption(settings, "hide_via", [&](auto v) { - cSetHideVia(v); - }); - return true; } diff --git a/Telegram/SourceFiles/kotato/settings.cpp b/Telegram/SourceFiles/kotato/settings.cpp index 0080ade95..76c72b0cc 100644 --- a/Telegram/SourceFiles/kotato/settings.cpp +++ b/Telegram/SourceFiles/kotato/settings.cpp @@ -267,5 +267,3 @@ bool gAutoScrollUnfocused = false; LocalFolderVector gLocalFolders; bool gTelegramSitesAutologin = true; - -bool gHideVia = false; diff --git a/Telegram/SourceFiles/kotato/settings.h b/Telegram/SourceFiles/kotato/settings.h index 74acfe19f..85448f02f 100644 --- a/Telegram/SourceFiles/kotato/settings.h +++ b/Telegram/SourceFiles/kotato/settings.h @@ -179,5 +179,3 @@ using LocalFolderVector = std::vector; DeclareRefSetting(LocalFolderVector, LocalFolders); DeclareSetting(bool, TelegramSitesAutologin); - -DeclareSetting(bool, HideVia); diff --git a/Telegram/SourceFiles/kotato/settings_menu.cpp b/Telegram/SourceFiles/kotato/settings_menu.cpp index dc0547af6..fc075c65e 100644 --- a/Telegram/SourceFiles/kotato/settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/settings_menu.cpp @@ -682,11 +682,6 @@ void SetupKotatoOther(not_null container) { AddSkip(container); AddDividerText(container, tr::ktg_settings_external_video_player_about()); - AddSkip(container); - - SettingsMenuCSwitch(ktg_settings_hide_via, HideVia); - - AddSkip(container); } Kotato::Kotato(