From 3d2ae1a844d00a496fa042709ef0c92524a64037 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Fri, 4 Oct 2019 17:26:05 +0300 Subject: [PATCH] Making showing chat IDs optional --- .../default_kotato-settings-custom.json | 3 +- Telegram/SourceFiles/core/kotato_settings.cpp | 6 +++ .../info/profile/info_profile_actions.cpp | 54 ++++++++++--------- Telegram/SourceFiles/settings.cpp | 3 +- Telegram/SourceFiles/settings.h | 1 + 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/Telegram/Resources/default_kotato-settings-custom.json b/Telegram/Resources/default_kotato-settings-custom.json index c22296c9d..039c87f72 100644 --- a/Telegram/Resources/default_kotato-settings-custom.json +++ b/Telegram/Resources/default_kotato-settings-custom.json @@ -10,5 +10,6 @@ // }, // "sticker_height": 256, // "big_emoji_outline": true, - // "always_show_scheduled": false + // "always_show_scheduled": false, + // "show_chat_id": false } diff --git a/Telegram/SourceFiles/core/kotato_settings.cpp b/Telegram/SourceFiles/core/kotato_settings.cpp index 995ba806d..71246887c 100644 --- a/Telegram/SourceFiles/core/kotato_settings.cpp +++ b/Telegram/SourceFiles/core/kotato_settings.cpp @@ -172,6 +172,11 @@ bool Manager::readCustomFile() { if (settingsAlwaysShowScheduledIterator != settingsFonts.constEnd() && (*settingsAlwaysShowScheduledIterator).isBool()) { cSetAlwaysShowScheduled((*settingsAlwaysShowScheduledIterator).toBool()); } + + const auto settingsShowChatIdIterator = settings.constFind(qsl("show_chat_id")); + if (settingsShowChatIdIterator != settingsFonts.constEnd() && (*settingsShowChatIdIterator).isBool()) { + cSetShowChatId((*settingsShowChatIdIterator).toBool()); + } return true; } @@ -202,6 +207,7 @@ void Manager::writeDefaultFile() { settings.insert(qsl("sticker_height"), cStickerHeight()); settings.insert(qsl("big_emoji_outline"), cBigEmojiOutline()); settings.insert(qsl("always_show_scheduled"), cAlwaysShowScheduled()); + settings.insert(qsl("show_chat_id"), cShowChatId()); auto document = QJsonDocument(); document.setObject(settings); diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index d101b4c93..4d5740663 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -255,16 +255,18 @@ object_ptr DetailsFiller::setupInfo() { return result; }; if (const auto user = _peer->asUser()) { - if (user->isBot()) { - addInfoOneLine( - tr::ktg_profile_bot_id(), - IDValue(user), - tr::ktg_profile_copy_id(tr::now)); - } else { - addInfoOneLine( - tr::ktg_profile_user_id(), - IDValue(user), - tr::ktg_profile_copy_id(tr::now)); + if (cShowChatId()) { + if (user->isBot()) { + addInfoOneLine( + tr::ktg_profile_bot_id(), + IDValue(user), + tr::ktg_profile_copy_id(tr::now)); + } else { + addInfoOneLine( + tr::ktg_profile_user_id(), + IDValue(user), + tr::ktg_profile_copy_id(tr::now)); + } } if (user->session().supportMode()) { @@ -295,21 +297,23 @@ object_ptr DetailsFiller::setupInfo() { [=] { window->show(Box(EditContactBox, window, user)); }, tracker); } else { - if (_peer->isChat()) { - addInfoOneLine( - tr::ktg_profile_group_id(), - IDValue(_peer), - tr::ktg_profile_copy_id(tr::now)); - } else if (_peer->isMegagroup()) { - addInfoOneLine( - tr::ktg_profile_supergroup_id(), - IDValue(_peer), - tr::ktg_profile_copy_id(tr::now)); - } else { - addInfoOneLine( - tr::ktg_profile_channel_id(), - IDValue(_peer), - tr::ktg_profile_copy_id(tr::now)); + if (cShowChatId()) { + if (_peer->isChat()) { + addInfoOneLine( + tr::ktg_profile_group_id(), + IDValue(_peer), + tr::ktg_profile_copy_id(tr::now)); + } else if (_peer->isMegagroup()) { + addInfoOneLine( + tr::ktg_profile_supergroup_id(), + IDValue(_peer), + tr::ktg_profile_copy_id(tr::now)); + } else { + addInfoOneLine( + tr::ktg_profile_channel_id(), + IDValue(_peer), + tr::ktg_profile_copy_id(tr::now)); + } } auto linkText = LinkValue( diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 04f54a8aa..e40b48e9e 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -212,4 +212,5 @@ bool gSemiboldFontIsBold = false; int gStickerHeight = 256; bool gBigEmojiOutline = true; -bool gAlwaysShowScheduled = false; \ No newline at end of file +bool gAlwaysShowScheduled = false; +bool gShowChatId = false; diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index d4299077c..786828332 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -187,3 +187,4 @@ DeclareSetting(QString, MonospaceFont); DeclareSetting(int, StickerHeight); DeclareSetting(bool, BigEmojiOutline); DeclareSetting(bool, AlwaysShowScheduled); +DeclareSetting(bool, ShowChatId);