Minor improvements.

14 files changed, 16 insertions, 13 deletions

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 8e7098a87..6ddafa3ea 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -1607,7 +1607,7 @@ tonTransactionTypeUpgradedGiftPurchase user_id:int53 gift:upgradedGift = TonTran
 //@gift The gift
 //@commission_per_mille The number of Toncoins received by the Telegram for each 1000 Toncoins received by the seller of the gift
 //@commission_toncoin_amount The amount of Toncoins that were received by the Telegram; in the smallest units of the currency
-tonTransactionTypeUpgradedGiftSale user_id:int53 gift:upgradedGift commission_per_mille:int32 commission_toncoin_amount:int64 = TonTransactionType;
+tonTransactionTypeUpgradedGiftSale user_id:int53 gift:upgradedGift commission_per_mille:int32 commission_toncoin_amount:int53 = TonTransactionType;
 
 //@description The transaction is a transaction of an unsupported type
 tonTransactionTypeUnsupported = TonTransactionType;
@@ -1833,8 +1833,8 @@ botInfo short_description:string description:string photo:photo animation:animat
 //@outgoing_paid_message_star_count Number of Telegram Stars that must be paid by the current user for each sent message to the user
 //@gift_settings Settings for gift receiving for the user
 //@bot_verification Information about verification status of the user provided by a bot; may be null if none or unknown
-//@rating Description of the current rating of the user; may be null if none
-//@pending_rating Description of the rating of the user after the next change; may be null if the user isn't the current user or there are no pending rating changes
+//@rating The current rating of the user; may be null if none
+//@pending_rating The rating of the user after the next change; may be null if the user isn't the current user or there are no pending rating changes
 //@pending_rating_date Unix timestamp when rating of the user will change to pending_rating; 0 if the user isn't the current user or there are no pending rating changes
 //@business_info Information about business settings for Telegram Business accounts; may be null if none
 //@bot_info For bots, information about the bot; may be null if the user isn't a bot
@@ -11691,7 +11691,7 @@ addStoryAlbumStories chat_id:int53 story_album_id:int32 story_ids:vector<int32>
 //@story_ids Identifier of the stories to remove from the album
 removeStoryAlbumStories chat_id:int53 story_album_id:int32 story_ids:vector<int32> = StoryAlbum;
 
-//@description Changes order of stories in a album. If the album is owned by a supergroup or a channel chat, then
+//@description Changes order of stories in an album. If the album is owned by a supergroup or a channel chat, then
 //-requires can_edit_stories administrator right in the chat. Returns the changed album
 //@chat_id Identifier of the chat that owns the stories
 //@story_album_id Identifier of the story album
diff --git a/td/generate/tl_json_converter.cpp b/td/generate/tl_json_converter.cpp
index fed75559a..06de33812 100644
--- a/td/generate/tl_json_converter.cpp
+++ b/td/generate/tl_json_converter.cpp
@@ -12,7 +12,6 @@
 #include "td/utils/common.h"
 #include "td/utils/filesystem.h"
 #include "td/utils/FlatHashSet.h"
-#include "td/utils/misc.h"
 #include "td/utils/Slice.h"
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/StringBuilder.h"
@@ -260,8 +259,6 @@ void gen_json_converter_file(const tl::simple::Schema &schema, const std::string
     sb << "#include \"td/utils/common.h\"\n";
     sb << "#include \"td/utils/FlatHashMap.h\"\n";
     sb << "#include \"td/utils/Slice.h\"\n\n";
-
-    sb << "#include <functional>\n\n";
   }
   sb << "namespace td {\n";
   sb << "namespace td_api {\n";
diff --git a/td/telegram/AgeVerificationParameters.h b/td/telegram/AgeVerificationParameters.h
index 69de49564..b53216ae7 100644
--- a/td/telegram/AgeVerificationParameters.h
+++ b/td/telegram/AgeVerificationParameters.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
 #include "td/utils/StringBuilder.h"
diff --git a/td/telegram/DialogDate.h b/td/telegram/DialogDate.h
index e14caa122..d8bfac9ac 100644
--- a/td/telegram/DialogDate.h
+++ b/td/telegram/DialogDate.h
@@ -11,7 +11,6 @@
 #include "td/telegram/ServerMessageId.h"
 
 #include "td/utils/common.h"
-#include "td/utils/HashTableUtils.h"
 #include "td/utils/StringBuilder.h"
 
 #include <limits>
diff --git a/td/telegram/DialogPhoto.h b/td/telegram/DialogPhoto.h
index b4248e564..4be55e504 100644
--- a/td/telegram/DialogPhoto.h
+++ b/td/telegram/DialogPhoto.h
@@ -19,7 +19,6 @@ namespace td {
 
 class FileManager;
 struct Photo;
-class Td;
 
 struct DialogPhoto {
   FileId small_file_id;
diff --git a/td/telegram/Requests.cpp b/td/telegram/Requests.cpp
index 2649f8a03..1dd3b52fd 100644
--- a/td/telegram/Requests.cpp
+++ b/td/telegram/Requests.cpp
@@ -140,6 +140,7 @@
 #include "td/telegram/StarGiftCollectionId.h"
 #include "td/telegram/StarGiftId.h"
 #include "td/telegram/StarGiftManager.h"
+#include "td/telegram/StarGiftResalePrice.h"
 #include "td/telegram/StarGiftSettings.h"
 #include "td/telegram/StarManager.h"
 #include "td/telegram/StarSubscriptionPricing.h"
diff --git a/td/telegram/SearchPostsFlood.cpp b/td/telegram/SearchPostsFlood.cpp
index 2982aabee..ab70ee607 100644
--- a/td/telegram/SearchPostsFlood.cpp
+++ b/td/telegram/SearchPostsFlood.cpp
@@ -31,7 +31,7 @@ bool operator==(const SearchPostsFlood &lhs, const SearchPostsFlood &rhs) {
 
 StringBuilder &operator<<(StringBuilder &string_builder, const SearchPostsFlood &flood) {
   if (flood.remains_ == 0) {
-    string_builder << "Exhausted " << flood.total_daily_ << " free queries. Now have to pay " << flood.star_count_
+    string_builder << "Exhausted " << flood.total_daily_ << " free queries. Now, have to pay " << flood.star_count_
                    << " Stars till " << flood.wait_till_;
   } else {
     string_builder << "Have " << flood.remains_ << " left free queries out of " << flood.total_daily_;
diff --git a/td/telegram/StarGift.cpp b/td/telegram/StarGift.cpp
index 1d7c6db91..eab7c735d 100644
--- a/td/telegram/StarGift.cpp
+++ b/td/telegram/StarGift.cpp
@@ -6,7 +6,6 @@
 //
 #include "td/telegram/StarGift.h"
 
-#include "td/telegram/CurrencyAmount.h"
 #include "td/telegram/Dependencies.h"
 #include "td/telegram/DialogManager.h"
 #include "td/telegram/MessageSender.h"
diff --git a/td/telegram/StarGiftCollection.cpp b/td/telegram/StarGiftCollection.cpp
index 745924c53..f2b7a4326 100644
--- a/td/telegram/StarGiftCollection.cpp
+++ b/td/telegram/StarGiftCollection.cpp
@@ -6,9 +6,12 @@
 //
 #include "td/telegram/StarGiftCollection.h"
 
+#include "td/telegram/StickerFormat.h"
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/Td.h"
 
+#include "td/utils/logging.h"
+
 namespace td {
 
 StarGiftCollection::StarGiftCollection(Td *td,
diff --git a/td/telegram/StarGiftManager.cpp b/td/telegram/StarGiftManager.cpp
index 5c78cc4cf..5dcdbab6e 100644
--- a/td/telegram/StarGiftManager.cpp
+++ b/td/telegram/StarGiftManager.cpp
@@ -19,7 +19,6 @@
 #include "td/telegram/MessageQuote.h"
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/OnlineManager.h"
-#include "td/telegram/OptionManager.h"
 #include "td/telegram/PasswordManager.h"
 #include "td/telegram/StarGift.h"
 #include "td/telegram/StarGiftAttribute.h"
diff --git a/td/telegram/StarGiftManager.h b/td/telegram/StarGiftManager.h
index ff2990b92..7bb549410 100644
--- a/td/telegram/StarGiftManager.h
+++ b/td/telegram/StarGiftManager.h
@@ -22,6 +22,7 @@
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/FlatHashSet.h"
 #include "td/utils/Promise.h"
+#include "td/utils/Status.h"
 #include "td/utils/WaitFreeHashMap.h"
 
 #include <utility>
diff --git a/td/telegram/StoryAlbum.cpp b/td/telegram/StoryAlbum.cpp
index 1d116d3b4..ed4e79bad 100644
--- a/td/telegram/StoryAlbum.cpp
+++ b/td/telegram/StoryAlbum.cpp
@@ -6,11 +6,15 @@
 //
 #include "td/telegram/StoryAlbum.h"
 
+#include "td/telegram/Document.h"
 #include "td/telegram/DocumentsManager.h"
+#include "td/telegram/files/FileType.h"
 #include "td/telegram/StoryManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/VideosManager.h"
 
+#include "td/utils/logging.h"
+
 namespace td {
 
 StoryAlbum::StoryAlbum(Td *td, DialogId owner_dialog_id,
diff --git a/td/telegram/StoryManager.cpp b/td/telegram/StoryManager.cpp
index 5d3c7086f..34699f67c 100644
--- a/td/telegram/StoryManager.cpp
+++ b/td/telegram/StoryManager.cpp
@@ -61,6 +61,7 @@
 #include "td/utils/Time.h"
 #include "td/utils/tl_helpers.h"
 
+#include <algorithm>
 #include <limits>
 
 namespace td {
diff --git a/tdtl/td/tl/tl_generate.cpp b/tdtl/td/tl/tl_generate.cpp
index 3e1aa4f7f..e509ff651 100644
--- a/tdtl/td/tl/tl_generate.cpp
+++ b/tdtl/td/tl/tl_generate.cpp
@@ -17,6 +17,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <functional>
 #include <map>
 #include <set>
 #include <string>