Various improvements.

29 files changed, 37 insertions, 31 deletions

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 961796742..4f0435638 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -424,7 +424,7 @@ pollTypeRegular = PollType;
 //@description A poll in quiz mode, which has predefined correct answers
 //@correct_option_ids Increasing list of 0-based identifiers of the correct answer options; empty for a yet unanswered poll
 //@explanation Text that is shown when the user chooses an incorrect answer or taps on the lamp icon; empty for a yet unanswered poll
-//@explanation_media Media that is shown when the user chooses an incorrect answer or taps on the lamp icon; may be null if none or the poll is unanswered yet
+//@explanation_media Media that is shown when the user chooses an incorrect answer or taps on the lamp icon; may be null if none or the poll is unanswered yet.
 //-Currently, can be only of the types messageAnimation, messageAudio, messageDocument, messageLocation, messagePhoto, messageVenue, or messageVideo without caption
 pollTypeQuiz correct_option_ids:vector<int32> explanation:formattedText explanation_media:MessageContent = PollType;
 
@@ -10470,7 +10470,7 @@ updatePoll poll:poll = Update;
 updatePollAnswer poll_id:int64 voter_id:MessageSender option_ids:vector<string> option_positions:vector<int32> = Update;
 
 //@description A bot was created to be managed by the current bot; for bots only
-//@user_id Identifier of the user that created the bot
+//@user_id Identifier of the user who created the bot
 //@bot_user_id Identifier of the created managed bot
 updateNewManagedBot user_id:int53 bot_user_id:int53 = Update;
 
@@ -12301,7 +12301,7 @@ clickAnimatedEmojiMessage chat_id:int53 message_id:int53 = Sticker;
 
 //@description Informs TDLib that an audio was listened by the user
 //@audio_file_id Identifier of the file with an audio
-//@duration Duration of the listening to the audio
+//@duration Duration of the listening to the audio, in seconds
 listenToAudio audio_file_id:int32 duration:int32 = Ok;
 
 //@description Informs TDLib about details of a message view by the user from a chat, a message thread or a forum topic history. The method must be called if
diff --git a/td/telegram/BusinessConnectionManager.cpp b/td/telegram/BusinessConnectionManager.cpp
index 2dc4b165a..be18f93bf 100644
--- a/td/telegram/BusinessConnectionManager.cpp
+++ b/td/telegram/BusinessConnectionManager.cpp
@@ -29,7 +29,6 @@
 #include "td/telegram/MessageTopic.h"
 #include "td/telegram/misc.h"
 #include "td/telegram/OptionManager.h"
-#include "td/telegram/Photo.h"
 #include "td/telegram/ReplyMarkup.h"
 #include "td/telegram/SavedMessagesTopicId.h"
 #include "td/telegram/ServerMessageId.h"
diff --git a/td/telegram/DiffText.cpp b/td/telegram/DiffText.cpp
index bfbcc214a..6d63b7fcb 100644
--- a/td/telegram/DiffText.cpp
+++ b/td/telegram/DiffText.cpp
@@ -33,7 +33,7 @@ td_api::object_ptr<td_api::diffEntity> DiffText::DiffEntity::get_diff_entity_obj
 
 bool DiffText::check_entities() const {
   // entities must not intersect and must not begin and end in the middle of characters
-  int32 text_len = narrow_cast<int32>(utf8_utf16_length(text_));
+  auto text_len = narrow_cast<int32>(utf8_utf16_length(text_));
   int32 cur_pos = 0;
   for (auto &entity : entities_) {
     if (entity.offset_ < cur_pos) {
diff --git a/td/telegram/DraftMessage.hpp b/td/telegram/DraftMessage.hpp
index 9cce8588d..97c9b8a4c 100644
--- a/td/telegram/DraftMessage.hpp
+++ b/td/telegram/DraftMessage.hpp
@@ -11,7 +11,6 @@
 #include "td/telegram/InputMessageText.hpp"
 #include "td/telegram/MessageId.h"
 #include "td/telegram/MessageInputReplyTo.hpp"
-#include "td/telegram/MessageQuote.h"
 #include "td/telegram/SuggestedPost.hpp"
 #include "td/telegram/Version.h"
 
diff --git a/td/telegram/GroupCallMessage.cpp b/td/telegram/GroupCallMessage.cpp
index 6d7de818d..9b9caf179 100644
--- a/td/telegram/GroupCallMessage.cpp
+++ b/td/telegram/GroupCallMessage.cpp
@@ -17,7 +17,6 @@
 #include "td/telegram/UserManager.h"
 #include "td/telegram/Version.h"
 
-#include "td/utils/algorithm.h"
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/logging.h"
 #include "td/utils/Random.h"
diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp
index b9077f1bd..11495f714 100644
--- a/td/telegram/MessageContent.cpp
+++ b/td/telegram/MessageContent.cpp
@@ -63,6 +63,7 @@
 #include "td/telegram/MessageSearchFilter.h"
 #include "td/telegram/MessageSender.h"
 #include "td/telegram/MessagesManager.h"
+#include "td/telegram/MinChannel.h"
 #include "td/telegram/misc.h"
 #include "td/telegram/OptionManager.h"
 #include "td/telegram/OrderInfo.h"
@@ -1755,7 +1756,7 @@ class MessagePollAppendAnswer final : public MessageContent {
   string data;
 
   MessagePollAppendAnswer() = default;
-  explicit MessagePollAppendAnswer(MessageId poll_message_id, FormattedText &&text, string &&data)
+  MessagePollAppendAnswer(MessageId poll_message_id, FormattedText &&text, string &&data)
       : poll_message_id(poll_message_id), text(std::move(text)), data(std::move(data)) {
   }
 
@@ -1771,7 +1772,7 @@ class MessagePollDeleteAnswer final : public MessageContent {
   string data;
 
   MessagePollDeleteAnswer() = default;
-  explicit MessagePollDeleteAnswer(MessageId poll_message_id, FormattedText &&text, string &&data)
+  MessagePollDeleteAnswer(MessageId poll_message_id, FormattedText &&text, string &&data)
       : poll_message_id(poll_message_id), text(std::move(text)), data(std::move(data)) {
   }
 
diff --git a/td/telegram/MessageCover.cpp b/td/telegram/MessageCover.cpp
index 641ea7a43..d2c292dd8 100644
--- a/td/telegram/MessageCover.cpp
+++ b/td/telegram/MessageCover.cpp
@@ -8,6 +8,7 @@
 
 #include "td/telegram/Document.h"
 #include "td/telegram/DocumentsManager.h"
+#include "td/telegram/files/FileType.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/VideosManager.h"
 
diff --git a/td/telegram/MessageInputReplyTo.cpp b/td/telegram/MessageInputReplyTo.cpp
index 5bcbd942c..00f0374c5 100644
--- a/td/telegram/MessageInputReplyTo.cpp
+++ b/td/telegram/MessageInputReplyTo.cpp
@@ -17,6 +17,7 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/telegram_api.h"
 
+#include "td/utils/buffer.h"
 #include "td/utils/logging.h"
 #include "td/utils/utf8.h"
 
diff --git a/td/telegram/MessageQueryManager.cpp b/td/telegram/MessageQueryManager.cpp
index 8bbc960f7..aefa37c19 100644
--- a/td/telegram/MessageQueryManager.cpp
+++ b/td/telegram/MessageQueryManager.cpp
@@ -17,7 +17,6 @@
 #include "td/telegram/DialogParticipantManager.h"
 #include "td/telegram/FactCheck.h"
 #include "td/telegram/files/FileManager.h"
-#include "td/telegram/files/FileType.h"
 #include "td/telegram/FolderId.h"
 #include "td/telegram/ForumTopicManager.h"
 #include "td/telegram/Global.h"
@@ -180,10 +179,10 @@ class SendBotRequestedPeerQuery final : public Td::ResultHandler {
     telegram_api::object_ptr<telegram_api::InputPeer> input_peer;
     if (bot_user_id == UserId() && request_id.empty()) {
       input_peer = td_->dialog_manager_->get_input_peer(dialog_id, AccessRights::Write);
-      flags = telegram_api::messages_sendBotRequestedPeer::MSG_ID_MASK;
+      flags |= telegram_api::messages_sendBotRequestedPeer::MSG_ID_MASK;
     } else {
       input_peer = td_->dialog_manager_->get_input_peer(DialogId(bot_user_id), AccessRights::Write);
-      flags = telegram_api::messages_sendBotRequestedPeer::WEBAPP_REQ_ID_MASK;
+      flags |= telegram_api::messages_sendBotRequestedPeer::WEBAPP_REQ_ID_MASK;
     }
     if (input_peer == nullptr) {
       return on_error(Status::Error(400, "Can't access the chat"));
diff --git a/td/telegram/MessageQueryManager.h b/td/telegram/MessageQueryManager.h
index 237a7116c..51e78d019 100644
--- a/td/telegram/MessageQueryManager.h
+++ b/td/telegram/MessageQueryManager.h
@@ -12,6 +12,7 @@
 #include "td/telegram/DialogId.h"
 #include "td/telegram/DialogListId.h"
 #include "td/telegram/EmojiGameInfo.h"
+#include "td/telegram/files/FileId.h"
 #include "td/telegram/files/FileUploadId.h"
 #include "td/telegram/ForumTopicId.h"
 #include "td/telegram/MessageCover.h"
@@ -21,10 +22,10 @@
 #include "td/telegram/MessageThreadInfo.h"
 #include "td/telegram/MessageTopic.h"
 #include "td/telegram/MessageViewer.h"
-#include "td/telegram/Photo.h"
 #include "td/telegram/SavedMessagesTopicId.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/telegram_api.h"
+#include "td/telegram/UserId.h"
 
 #include "td/actor/actor.h"
 #include "td/actor/MultiTimeout.h"
diff --git a/td/telegram/MessageQuote.cpp b/td/telegram/MessageQuote.cpp
index c2acb3ca9..18aebe144 100644
--- a/td/telegram/MessageQuote.cpp
+++ b/td/telegram/MessageQuote.cpp
@@ -14,6 +14,7 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/algorithm.h"
+#include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/Slice.h"
 #include "td/utils/utf8.h"
diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index fe0dc4ad6..c3bffbcd1 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -11,7 +11,6 @@
 #include "td/telegram/MessageSender.h"
 #include "td/telegram/ServerMessageId.h"
 #include "td/telegram/Td.h"
-#include "td/telegram/UserManager.h"
 
 #include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 0839c16e0..1c929554f 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -82,6 +82,7 @@
 #include "td/telegram/RepliedMessageInfo.hpp"
 #include "td/telegram/ReplyMarkup.h"
 #include "td/telegram/ReplyMarkup.hpp"
+#include "td/telegram/RequestedDialogType.h"
 #include "td/telegram/SavedMessagesManager.h"
 #include "td/telegram/SecretChatsManager.h"
 #include "td/telegram/SponsoredMessageManager.h"
@@ -112,6 +113,7 @@
 #include "td/actor/SleepActor.h"
 
 #include "td/utils/algorithm.h"
+#include "td/utils/base64.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
@@ -120,6 +122,7 @@
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/Time.h"
 #include "td/utils/tl_helpers.h"
+#include "td/utils/utf8.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/td/telegram/PollManager.cpp b/td/telegram/PollManager.cpp
index ab9dadd49..f24d7f704 100644
--- a/td/telegram/PollManager.cpp
+++ b/td/telegram/PollManager.cpp
@@ -16,6 +16,8 @@
 #include "td/telegram/ForumTopicManager.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/logevent/LogEvent.h"
+#include "td/telegram/MessageContent.h"
+#include "td/telegram/MessageCopyOptions.h"
 #include "td/telegram/MessageId.h"
 #include "td/telegram/MessageSender.h"
 #include "td/telegram/MessagesManager.h"
@@ -28,6 +30,7 @@
 #include "td/telegram/TdDb.h"
 #include "td/telegram/telegram_api.h"
 #include "td/telegram/UpdatesManager.h"
+#include "td/telegram/UserId.h"
 #include "td/telegram/UserManager.h"
 
 #include "td/db/binlog/BinlogEvent.h"
@@ -38,6 +41,7 @@
 #include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
+#include "td/utils/crypto.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
diff --git a/td/telegram/PollManager.h b/td/telegram/PollManager.h
index 526505ee9..5ff8ce3bd 100644
--- a/td/telegram/PollManager.h
+++ b/td/telegram/PollManager.h
@@ -8,9 +8,11 @@
 
 #include "td/telegram/ChannelId.h"
 #include "td/telegram/DialogId.h"
+#include "td/telegram/files/FileId.h"
 #include "td/telegram/ForumTopicId.h"
 #include "td/telegram/MessageEntity.h"
 #include "td/telegram/MessageFullId.h"
+#include "td/telegram/MessageId.h"
 #include "td/telegram/MinChannel.h"
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/PollId.h"
diff --git a/td/telegram/PollManager.hpp b/td/telegram/PollManager.hpp
index eae8e9fe2..350945d39 100644
--- a/td/telegram/PollManager.hpp
+++ b/td/telegram/PollManager.hpp
@@ -151,7 +151,7 @@ void PollManager::Poll::parse(ParserT &parser) {
     }
     auto status = check_quiz_correct_option_ids(correct_option_ids_, options_.size(), true);
     if (status.is_error()) {
-      parser.set_error(status.error().message().str());
+      parser.set_error(status.message().str());
       return;
     }
   }
@@ -318,7 +318,7 @@ PollId PollManager::parse_poll(ParserT &parser) {
       }
       auto status = check_quiz_correct_option_ids(correct_option_ids, option_texts.size(), false);
       if (status.is_error()) {
-        parser.set_error(status.error().message().str());
+        parser.set_error(status.message().str());
         return PollId();
       }
     }
diff --git a/td/telegram/PollOption.cpp b/td/telegram/PollOption.cpp
index 0a50e889b..388625666 100644
--- a/td/telegram/PollOption.cpp
+++ b/td/telegram/PollOption.cpp
@@ -8,6 +8,7 @@
 
 #include "td/telegram/Dependencies.h"
 #include "td/telegram/MessageContent.h"
+#include "td/telegram/MessageId.h"
 #include "td/telegram/MessageSender.h"
 
 #include "td/utils/algorithm.h"
diff --git a/td/telegram/PollOption.h b/td/telegram/PollOption.h
index 67566b7a7..4d9162569 100644
--- a/td/telegram/PollOption.h
+++ b/td/telegram/PollOption.h
@@ -8,6 +8,7 @@
 
 #include "td/telegram/ChannelId.h"
 #include "td/telegram/DialogId.h"
+#include "td/telegram/files/FileId.h"
 #include "td/telegram/MessageEntity.h"
 #include "td/telegram/MinChannel.h"
 #include "td/telegram/td_api.h"
diff --git a/td/telegram/QuickReplyManager.cpp b/td/telegram/QuickReplyManager.cpp
index 0b5c93f23..2386ccd67 100644
--- a/td/telegram/QuickReplyManager.cpp
+++ b/td/telegram/QuickReplyManager.cpp
@@ -24,7 +24,6 @@
 #include "td/telegram/MessageCopyOptions.h"
 #include "td/telegram/MessageInputReplyTo.h"
 #include "td/telegram/MessageQueryManager.h"
-#include "td/telegram/MessageQuote.h"
 #include "td/telegram/MessageReplyHeader.h"
 #include "td/telegram/MessageSelfDestructType.h"
 #include "td/telegram/MessageTopic.h"
diff --git a/td/telegram/RequestedDialogType.cpp b/td/telegram/RequestedDialogType.cpp
index cc4032ce9..05d2920b7 100644
--- a/td/telegram/RequestedDialogType.cpp
+++ b/td/telegram/RequestedDialogType.cpp
@@ -12,6 +12,8 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/UserManager.h"
 
+#include "td/utils/logging.h"
+
 namespace td {
 
 RequestedDialogType::RequestedDialogType(td_api::object_ptr<td_api::keyboardButtonTypeRequestUsers> &&request_users) {
diff --git a/td/telegram/ToDoItem.cpp b/td/telegram/ToDoItem.cpp
index 40868f37b..45b52d03f 100644
--- a/td/telegram/ToDoItem.cpp
+++ b/td/telegram/ToDoItem.cpp
@@ -12,7 +12,6 @@
 #include "td/telegram/OptionManager.h"
 #include "td/telegram/Td.h"
 
-#include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/SliceBuilder.h"
diff --git a/td/telegram/TranslationManager.cpp b/td/telegram/TranslationManager.cpp
index fc73605cb..0f63f1fc2 100644
--- a/td/telegram/TranslationManager.cpp
+++ b/td/telegram/TranslationManager.cpp
@@ -11,14 +11,15 @@
 #include "td/telegram/DialogManager.h"
 #include "td/telegram/DiffText.h"
 #include "td/telegram/Global.h"
+#include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/Td.h"
+#include "td/telegram/TdDb.h"
 #include "td/telegram/telegram_api.h"
 
-#include "td/telegram/logevent/LogEvent.h"
-
 #include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 #include "td/utils/Status.h"
 
 namespace td {
diff --git a/td/telegram/VideosManager.cpp b/td/telegram/VideosManager.cpp
index 5a160dcec..fa07ec588 100644
--- a/td/telegram/VideosManager.cpp
+++ b/td/telegram/VideosManager.cpp
@@ -7,7 +7,9 @@
 #include "td/telegram/VideosManager.h"
 
 #include "td/telegram/AuthManager.h"
+#include "td/telegram/Document.h"
 #include "td/telegram/DocumentsManager.h"
+#include "td/telegram/files/FileLocation.h"
 #include "td/telegram/files/FileManager.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/PhotoFormat.h"
diff --git a/td/telegram/VideosManager.h b/td/telegram/VideosManager.h
index 4e5164d36..aa047c419 100644
--- a/td/telegram/VideosManager.h
+++ b/td/telegram/VideosManager.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "td/telegram/DialogId.h"
 #include "td/telegram/Dimensions.h"
 #include "td/telegram/files/FileId.h"
 #include "td/telegram/Photo.h"
diff --git a/td/telegram/net/ConnectionCreator.cpp b/td/telegram/net/ConnectionCreator.cpp
index f029b7b32..c9d06f418 100644
--- a/td/telegram/net/ConnectionCreator.cpp
+++ b/td/telegram/net/ConnectionCreator.cpp
@@ -12,16 +12,12 @@
 #include "td/telegram/net/MtprotoHeader.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/net/NetType.h"
-#include "td/telegram/net/PublicRsaKeySharedMain.h"
 #include "td/telegram/PromoDataManager.h"
 #include "td/telegram/StateManager.h"
 #include "td/telegram/TdDb.h"
 
-#include "td/mtproto/DhCallback.h"
-#include "td/mtproto/HandshakeActor.h"
 #include "td/mtproto/Ping.h"
 #include "td/mtproto/ProxySecret.h"
-#include "td/mtproto/RSA.h"
 #include "td/mtproto/TlsInit.h"
 
 #include "td/net/GetHostByNameActor.h"
@@ -29,8 +25,6 @@
 #include "td/net/Socks5.h"
 #include "td/net/TransparentProxy.h"
 
-#include "td/actor/SleepActor.h"
-
 #include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/format.h"
diff --git a/td/telegram/net/ConnectionCreator.h b/td/telegram/net/ConnectionCreator.h
index f61af57c2..4c2301394 100644
--- a/td/telegram/net/ConnectionCreator.h
+++ b/td/telegram/net/ConnectionCreator.h
@@ -15,7 +15,6 @@
 
 #include "td/mtproto/AuthData.h"
 #include "td/mtproto/ConnectionManager.h"
-#include "td/mtproto/Handshake.h"
 #include "td/mtproto/RawConnection.h"
 #include "td/mtproto/TransportType.h"
 
diff --git a/td/telegram/net/ProxyChecker.h b/td/telegram/net/ProxyChecker.h
index cca8189af..84bdb8e8f 100644
--- a/td/telegram/net/ProxyChecker.h
+++ b/td/telegram/net/ProxyChecker.h
@@ -28,8 +28,8 @@ class ProxyChecker final : public NetQueryCallback {
   explicit ProxyChecker(ActorShared<> parent);
   ProxyChecker(const ProxyChecker &) = delete;
   ProxyChecker &operator=(const ProxyChecker &) = delete;
-  ProxyChecker(ProxyChecker &&other) = delete;
-  ProxyChecker &operator=(ProxyChecker &&other) = delete;
+  ProxyChecker(ProxyChecker &&) = delete;
+  ProxyChecker &operator=(ProxyChecker &&) = delete;
   ~ProxyChecker() final = default;
 
   void test_proxy(Proxy &&proxy, int32 dc_id, double timeout, Promise<Unit> &&promise);
diff --git a/tdutils/td/utils/tests.h b/tdutils/td/utils/tests.h
index dd70678c2..4497b71bb 100644
--- a/tdutils/td/utils/tests.h
+++ b/tdutils/td/utils/tests.h
@@ -12,7 +12,6 @@
 #include "td/utils/logging.h"
 #include "td/utils/port/sleep.h"
 #include "td/utils/Slice.h"
-#include "td/utils/Span.h"
 #include "td/utils/Status.h"
 
 #include <atomic>
diff --git a/tdutils/test/hashset_benchmark.cpp b/tdutils/test/hashset_benchmark.cpp
index ed53468bd..d40055a68 100644
--- a/tdutils/test/hashset_benchmark.cpp
+++ b/tdutils/test/hashset_benchmark.cpp
@@ -17,7 +17,6 @@
 #include "td/utils/Slice.h"
 #include "td/utils/Span.h"
 #include "td/utils/StringBuilder.h"
-#include "td/utils/tests.h"
 #include "td/utils/Time.h"
 #include "td/utils/VectorQueue.h"