From f1cc64ec16e76c2febf2eb2ec37999e3087581cf Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 22 Nov 2019 13:41:17 +0300
Subject: [PATCH] Add userPrivacySettingAllowFindingByPhoneNumber.

GitOrigin-RevId: f1d03087d185a9df52ab24ecb5ba93e54df9895e
---
 td/generate/scheme/td_api.tl   |   3 +++
 td/generate/scheme/td_api.tlo  | Bin 164260 -> 164344 bytes
 td/telegram/PrivacyManager.cpp |  22 ++++++++++++++++++++--
 td/telegram/PrivacyManager.h   |   1 +
 td/telegram/cli.cpp            |   4 ++++
 5 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index f1aae2847..f7b260d27 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -2372,6 +2372,9 @@ userPrivacySettingAllowCalls = UserPrivacySetting;
 //@description A privacy setting for managing whether peer-to-peer connections can be used for calls
 userPrivacySettingAllowPeerToPeerCalls = UserPrivacySetting;
 
+//@description A privacy setting for managing whether the user can be found by its phone number. Checked only if the phone number is not known to the other user. Can be set only to "Allow contacts" or "Allow all"
+userPrivacySettingAllowFindingByPhoneNumber = UserPrivacySetting;
+
 
 //@description Contains information about the period of inactivity after which the current user's account will automatically be deleted @days Number of days of inactivity before the account will be flagged for deletion; should range from 30-366 days
 accountTtl days:int32 = AccountTtl;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 10c6a9682aa31eb2280a97af591db5bff0adecc2..95a49e4694afab008fec441de9fceb85b7ca2d0b 100644
GIT binary patch
delta 381
zcmZ3|%=M$0YeR^J<oEEECxt?bQ;PzMGRqQ^D}z%@N;31(88{|?l$Y4ts!`6w__z75
z*7m<zjMHmbK&q!7C}c92uF%UUu>Hmg#sk6<Ai<l*gnSr)pvaj`hr_n*AXwpsJ&Y!}
zW&iA9bigeevKOD;1$brO>}52-ZL-NeMhi_`ZU*@Q1g^?)#RTTQo2Wf~<6cH_9k<N9
x6kw=0RR(0_=cW3U<|d^U;WA=-%RWYzd`M6k9AZ@1{zjMSf-{)E9T;>^_yMLLn?L{n

delta 308
zcmey-%(bMMYeR^J<T5Mw2%*s8)S`f*%(BGf%HY(JlFYnx2KLDx<s~+^YLqiE{%QWJ
zwf(Oa<Mdh<km}_#RxpZ4fLJ$=3HdMpL6I|?4u@^qL6F$=4SN_(aLfML!{~rpHe@e8
zy$kTlzS+xYfZJq~eT)`3Ww+nh$LNv|_S|*_J*E%NVCHn7KMkf|xX385J*0?f2|oZD
C=V}W8

diff --git a/td/telegram/PrivacyManager.cpp b/td/telegram/PrivacyManager.cpp
index 747535f7c..e52981be3 100644
--- a/td/telegram/PrivacyManager.cpp
+++ b/td/telegram/PrivacyManager.cpp
@@ -55,6 +55,9 @@ PrivacyManager::UserPrivacySetting::UserPrivacySetting(const telegram_api::Priva
     case telegram_api::privacyKeyPhoneNumber::ID:
       type_ = Type::UserPhoneNumber;
       break;
+    case telegram_api::privacyKeyAddedByPhone::ID:
+      type_ = Type::FindByPhoneNumber;
+      break;
     default:
       UNREACHABLE();
       type_ = Type::UserStatus;
@@ -77,6 +80,8 @@ tl_object_ptr<td_api::UserPrivacySetting> PrivacyManager::UserPrivacySetting::as
       return make_tl_object<td_api::userPrivacySettingShowProfilePhoto>();
     case Type::UserPhoneNumber:
       return make_tl_object<td_api::userPrivacySettingShowPhoneNumber>();
+    case Type::FindByPhoneNumber:
+      return make_tl_object<td_api::userPrivacySettingAllowFindingByPhoneNumber>();
     default:
       UNREACHABLE();
       return nullptr;
@@ -98,6 +103,8 @@ tl_object_ptr<telegram_api::InputPrivacyKey> PrivacyManager::UserPrivacySetting:
       return make_tl_object<telegram_api::inputPrivacyKeyProfilePhoto>();
     case Type::UserPhoneNumber:
       return make_tl_object<telegram_api::inputPrivacyKeyPhoneNumber>();
+    case Type::FindByPhoneNumber:
+      return make_tl_object<telegram_api::inputPrivacyKeyAddedByPhone>();
     default:
       UNREACHABLE();
       return nullptr;
@@ -127,6 +134,9 @@ PrivacyManager::UserPrivacySetting::UserPrivacySetting(const td_api::UserPrivacy
     case td_api::userPrivacySettingShowPhoneNumber::ID:
       type_ = Type::UserPhoneNumber;
       break;
+    case td_api::userPrivacySettingAllowFindingByPhoneNumber::ID:
+      type_ = Type::FindByPhoneNumber;
+      break;
     default:
       UNREACHABLE();
       type_ = Type::UserStatus;
@@ -348,6 +358,10 @@ Result<PrivacyManager::UserPrivacySettingRules> PrivacyManager::UserPrivacySetti
     TRY_RESULT(new_rule, UserPrivacySettingRule::from_telegram_api(std::move(rule)));
     result.rules_.push_back(new_rule);
   }
+  if (!result.rules_.empty() &&
+      result.rules_.back().as_td_api()->get_id() == td_api::userPrivacySettingRuleRestrictAll::ID) {
+    result.rules_.pop_back();
+  }
   return result;
 }
 
@@ -372,7 +386,11 @@ tl_object_ptr<td_api::userPrivacySettingRules> PrivacyManager::UserPrivacySettin
 }
 
 vector<tl_object_ptr<telegram_api::InputPrivacyRule>> PrivacyManager::UserPrivacySettingRules::as_telegram_api() const {
-  return transform(rules_, [](const auto &rule) { return rule.as_telegram_api(); });
+  auto result = transform(rules_, [](const auto &rule) { return rule.as_telegram_api(); });
+  if (!result.empty() && result.back()->get_id() == telegram_api::inputPrivacyValueDisallowAll::ID) {
+    result.pop_back();
+  }
+  return result;
 }
 
 void PrivacyManager::get_privacy(tl_object_ptr<td_api::UserPrivacySetting> key,
@@ -432,11 +450,11 @@ void PrivacyManager::set_privacy(tl_object_ptr<td_api::UserPrivacySetting> key,
                     PromiseCreator::lambda([this, user_privacy_setting,
                                             promise = std::move(promise)](Result<NetQueryPtr> x_net_query) mutable {
                       promise.set_result([&]() -> Result<Unit> {
+                        get_info(user_privacy_setting).has_set_query = false;
                         TRY_RESULT(net_query, std::move(x_net_query));
                         TRY_RESULT(rules, fetch_result<telegram_api::account_setPrivacy>(std::move(net_query)));
                         LOG(INFO) << "Receive " << to_string(rules);
                         TRY_RESULT(privacy_rules, UserPrivacySettingRules::from_telegram_api(std::move(rules)));
-                        get_info(user_privacy_setting).has_set_query = false;
                         do_update_privacy(user_privacy_setting, std::move(privacy_rules), true);
                         return Unit();
                       }());
diff --git a/td/telegram/PrivacyManager.h b/td/telegram/PrivacyManager.h
index d8e2056f7..f6eab5ee9 100644
--- a/td/telegram/PrivacyManager.h
+++ b/td/telegram/PrivacyManager.h
@@ -45,6 +45,7 @@ class PrivacyManager : public NetQueryCallback {
       LinkInForwardedMessages,
       UserProfilePhoto,
       UserPhoneNumber,
+      FindByPhoneNumber,
       Size
     };
 
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 1488fb8e5..7057a4024 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -951,6 +951,9 @@ class CliClient final : public Actor {
     if (setting == "phone_number") {
       return td_api::make_object<td_api::userPrivacySettingShowPhoneNumber>();
     }
+    if (setting == "find") {
+      return td_api::make_object<td_api::userPrivacySettingAllowFindingByPhoneNumber>();
+    }
     return nullptr;
   }
 
@@ -1579,6 +1582,7 @@ class CliClient final : public Actor {
         rules.push_back(td_api::make_object<td_api::userPrivacySettingRuleAllowChatMembers>(as_chat_ids(ids)));
       } else if (as_bool(allow)) {
         rules.push_back(td_api::make_object<td_api::userPrivacySettingRuleAllowAll>());
+        rules.push_back(td_api::make_object<td_api::userPrivacySettingRuleRestrictAll>());
       } else {
         rules.push_back(td_api::make_object<td_api::userPrivacySettingRuleRestrictAll>());
       }