From 95131fe3766310bf90dc3d7496e1da20a409a41f Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 30 Jun 2022 20:27:08 +0300
Subject: [PATCH] Update TDLib.

---
 build.html                              | 4 ++--
 telegram-bot-api/Client.cpp             | 2 --
 telegram-bot-api/Client.h               | 2 +-
 telegram-bot-api/ClientManager.cpp      | 2 +-
 telegram-bot-api/ClientManager.h        | 2 +-
 telegram-bot-api/HttpConnection.cpp     | 1 +
 telegram-bot-api/HttpConnection.h       | 2 +-
 telegram-bot-api/HttpStatConnection.cpp | 2 +-
 telegram-bot-api/Query.h                | 2 +-
 telegram-bot-api/WebhookActor.cpp       | 2 +-
 telegram-bot-api/WebhookActor.h         | 1 -
 telegram-bot-api/telegram-bot-api.cpp   | 2 +-
 12 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/build.html b/build.html
index 409fb28..d43e23a 100644
--- a/build.html
+++ b/build.html
@@ -181,7 +181,7 @@
 
 <div class="main">
   <div id="osSelectDiv" class="large">
-    <p>Choose an operating system, on which you want to use the Telegram Bot API server:</p>
+    <p>Choose an operating system on which you want to use the Telegram Bot API server:</p>
     <select id="osSelect" onchange="onOsChanged(false)" autofocus class="large">
       <option>Choose an operating system:</option>
       <option>Windows</option>
@@ -195,7 +195,7 @@
   </div>
 
   <div id="linuxSelectDiv" class="hide">
-    <p>Choose a Linux distro, on which you want to use the Telegram Bot API server:</p>
+    <p>Choose a Linux distro on which you want to use the Telegram Bot API server:</p>
     <select id="linuxSelect" onchange="onOsChanged(false)" class="large">
       <option>Choose a Linux distro:</option>
       <option>Alpine</option>
diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp
index d0c8121..abd776c 100644
--- a/telegram-bot-api/Client.cpp
+++ b/telegram-bot-api/Client.cpp
@@ -10,7 +10,6 @@
 
 #include "td/db/TQueue.h"
 
-#include "td/actor/PromiseFuture.h"
 #include "td/actor/SleepActor.h"
 
 #include "td/utils/algorithm.h"
@@ -22,7 +21,6 @@
 #include "td/utils/misc.h"
 #include "td/utils/PathView.h"
 #include "td/utils/port/path.h"
-#include "td/utils/port/Stat.h"
 #include "td/utils/Slice.h"
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/Span.h"
diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h
index 852c309..2a47017 100644
--- a/telegram-bot-api/Client.h
+++ b/telegram-bot-api/Client.h
@@ -16,7 +16,6 @@
 #include "td/net/HttpFile.h"
 
 #include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
 #include "td/actor/SignalSlot.h"
 
 #include "td/utils/common.h"
@@ -24,6 +23,7 @@
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/FlatHashSet.h"
 #include "td/utils/JsonBuilder.h"
+#include "td/utils/Promise.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 
diff --git a/telegram-bot-api/ClientManager.cpp b/telegram-bot-api/ClientManager.cpp
index 12074c0..8a58b22 100644
--- a/telegram-bot-api/ClientManager.cpp
+++ b/telegram-bot-api/ClientManager.cpp
@@ -118,7 +118,7 @@ void ClientManager::send(PromisedQueryPtr query) {
       flood_control.add_event(static_cast<td::int32>(now));
     }
     auto tqueue_id = get_tqueue_id(user_id, query->is_test_dc());
-    if (active_client_count_.find(tqueue_id) != active_client_count_.end()) {
+    if (active_client_count_.count(tqueue_id) != 0) {
       // return query->set_retry_after_error(1);
     }
 
diff --git a/telegram-bot-api/ClientManager.h b/telegram-bot-api/ClientManager.h
index 9bf30c4..921aaf0 100644
--- a/telegram-bot-api/ClientManager.h
+++ b/telegram-bot-api/ClientManager.h
@@ -11,13 +11,13 @@
 #include "telegram-bot-api/Stats.h"
 
 #include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
 
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/Container.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/FloodControlFast.h"
+#include "td/utils/Promise.h"
 #include "td/utils/Slice.h"
 
 #include <memory>
diff --git a/telegram-bot-api/HttpConnection.cpp b/telegram-bot-api/HttpConnection.cpp
index 5d718f3..b3fd1cf 100644
--- a/telegram-bot-api/HttpConnection.cpp
+++ b/telegram-bot-api/HttpConnection.cpp
@@ -14,6 +14,7 @@
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/logging.h"
 #include "td/utils/Parser.h"
+#include "td/utils/Promise.h"
 #include "td/utils/SliceBuilder.h"
 
 namespace telegram_bot_api {
diff --git a/telegram-bot-api/HttpConnection.h b/telegram-bot-api/HttpConnection.h
index c2e1148..d0d245c 100644
--- a/telegram-bot-api/HttpConnection.h
+++ b/telegram-bot-api/HttpConnection.h
@@ -13,10 +13,10 @@
 #include "td/net/HttpQuery.h"
 
 #include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
 
 #include "td/utils/buffer.h"
 #include "td/utils/Slice.h"
+#include "td/utils/Status.h"
 
 #include <memory>
 
diff --git a/telegram-bot-api/HttpStatConnection.cpp b/telegram-bot-api/HttpStatConnection.cpp
index 21ac451..9314a64 100644
--- a/telegram-bot-api/HttpStatConnection.cpp
+++ b/telegram-bot-api/HttpStatConnection.cpp
@@ -9,7 +9,7 @@
 #include "td/net/HttpHeaderCreator.h"
 
 #include "td/utils/common.h"
-#include "td/utils/logging.h"
+#include "td/utils/Promise.h"
 
 namespace telegram_bot_api {
 
diff --git a/telegram-bot-api/Query.h b/telegram-bot-api/Query.h
index c1df8b5..c315fd5 100644
--- a/telegram-bot-api/Query.h
+++ b/telegram-bot-api/Query.h
@@ -11,7 +11,6 @@
 #include "td/net/HttpFile.h"
 
 #include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
 
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
@@ -19,6 +18,7 @@
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/List.h"
 #include "td/utils/port/IPAddress.h"
+#include "td/utils/Promise.h"
 #include "td/utils/Slice.h"
 #include "td/utils/StringBuilder.h"
 
diff --git a/telegram-bot-api/WebhookActor.cpp b/telegram-bot-api/WebhookActor.cpp
index 095b5cf..f63cd55 100644
--- a/telegram-bot-api/WebhookActor.cpp
+++ b/telegram-bot-api/WebhookActor.cpp
@@ -15,7 +15,6 @@
 #include "td/net/TransparentProxy.h"
 
 #include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
 
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
@@ -26,6 +25,7 @@
 #include "td/utils/misc.h"
 #include "td/utils/port/IPAddress.h"
 #include "td/utils/port/SocketFd.h"
+#include "td/utils/Promise.h"
 #include "td/utils/Random.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/SliceBuilder.h"
diff --git a/telegram-bot-api/WebhookActor.h b/telegram-bot-api/WebhookActor.h
index 4ca2c34..28f5989 100644
--- a/telegram-bot-api/WebhookActor.h
+++ b/telegram-bot-api/WebhookActor.h
@@ -15,7 +15,6 @@
 #include "td/net/SslStream.h"
 
 #include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
 
 #include "td/utils/BufferedFd.h"
 #include "td/utils/common.h"
diff --git a/telegram-bot-api/telegram-bot-api.cpp b/telegram-bot-api/telegram-bot-api.cpp
index bdce424..97a220a 100644
--- a/telegram-bot-api/telegram-bot-api.cpp
+++ b/telegram-bot-api/telegram-bot-api.cpp
@@ -22,7 +22,6 @@
 
 #include "td/actor/actor.h"
 #include "td/actor/ConcurrentScheduler.h"
-#include "td/actor/PromiseFuture.h"
 
 #include "td/utils/buffer.h"
 #include "td/utils/CombinedLog.h"
@@ -45,6 +44,7 @@
 #include "td/utils/port/stacktrace.h"
 #include "td/utils/port/Stat.h"
 #include "td/utils/port/user.h"
+#include "td/utils/Promise.h"
 #include "td/utils/Slice.h"
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/Status.h"