Minor improvements.

13 files changed, 24 insertions, 21 deletions

diff --git a/td/telegram/ChatReactions.cpp b/td/telegram/ChatReactions.cpp
index 3d302d690..ac2c6370e 100644
--- a/td/telegram/ChatReactions.cpp
+++ b/td/telegram/ChatReactions.cpp
@@ -6,9 +6,6 @@
 //
 #include "td/telegram/ChatReactions.h"
 
-#include "td/telegram/MessageReaction.h"
-#include "td/telegram/telegram_api.h"
-
 #include "td/utils/algorithm.h"
 
 namespace td {
diff --git a/td/telegram/ConfigManager.cpp b/td/telegram/ConfigManager.cpp
index 74ac996ab..899ca844b 100644
--- a/td/telegram/ConfigManager.cpp
+++ b/td/telegram/ConfigManager.cpp
@@ -13,7 +13,6 @@
 #include "td/telegram/JsonValue.h"
 #include "td/telegram/LinkManager.h"
 #include "td/telegram/logevent/LogEvent.h"
-#include "td/telegram/MessageReaction.h"
 #include "td/telegram/misc.h"
 #include "td/telegram/net/AuthDataShared.h"
 #include "td/telegram/net/ConnectionCreator.h"
diff --git a/td/telegram/FullMessageId.h b/td/telegram/FullMessageId.h
index 414b4d68a..1b8aac936 100644
--- a/td/telegram/FullMessageId.h
+++ b/td/telegram/FullMessageId.h
@@ -11,6 +11,7 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
+#include "td/utils/HashTableUtils.h"
 #include "td/utils/StringBuilder.h"
 
 namespace td {
diff --git a/td/telegram/MessageReaction.cpp b/td/telegram/MessageReaction.cpp
index d394fb2fc..a4eafe984 100644
--- a/td/telegram/MessageReaction.cpp
+++ b/td/telegram/MessageReaction.cpp
@@ -12,7 +12,6 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/MessageSender.h"
 #include "td/telegram/MessagesManager.h"
-#include "td/telegram/OptionManager.h"
 #include "td/telegram/ServerMessageId.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/telegram_api.h"
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 9b6cc59b6..17e9b754f 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -38697,7 +38697,7 @@ void MessagesManager::on_get_channel_difference(DialogId dialog_id, int32 reques
 
   if (difference_ptr == nullptr) {
     CHECK(status.is_error());
-    bool have_access = have_input_peer(dialog_id, AccessRights::Read) && status.error().message() != "CHANNEL_INVALID";
+    bool have_access = have_input_peer(dialog_id, AccessRights::Read) && status.message() != "CHANNEL_INVALID";
     if (have_access) {
       if (d == nullptr) {
         force_create_dialog(dialog_id, "on_get_channel_difference failed");
diff --git a/td/telegram/ReactionType.cpp b/td/telegram/ReactionType.cpp
index bd2fba8ec..c8450a452 100644
--- a/td/telegram/ReactionType.cpp
+++ b/td/telegram/ReactionType.cpp
@@ -7,16 +7,21 @@
 #include "td/telegram/ReactionType.h"
 
 #include "td/telegram/ConfigManager.h"
+#include "td/telegram/Global.h"
 #include "td/telegram/misc.h"
 #include "td/telegram/OptionManager.h"
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/Td.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/as.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
 #include "td/utils/crypto.h"
 #include "td/utils/emoji.h"
+#include "td/utils/logging.h"
+#include "td/utils/Slice.h"
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/Status.h"
 #include "td/utils/utf8.h"
diff --git a/td/telegram/ReactionType.h b/td/telegram/ReactionType.h
index 51a7a3c3c..ab5a5087c 100644
--- a/td/telegram/ReactionType.h
+++ b/td/telegram/ReactionType.h
@@ -11,11 +11,14 @@
 
 #include "td/utils/common.h"
 #include "td/utils/FlatHashMap.h"
+#include "td/utils/HashTableUtils.h"
 #include "td/utils/Promise.h"
 #include "td/utils/StringBuilder.h"
 
 namespace td {
 
+struct ReactionTypeHash;
+
 class Td;
 
 class ReactionType {
diff --git a/td/telegram/StoryFullId.h b/td/telegram/StoryFullId.h
index a7e90ac1f..2f989cfc2 100644
--- a/td/telegram/StoryFullId.h
+++ b/td/telegram/StoryFullId.h
@@ -10,6 +10,7 @@
 #include "td/telegram/StoryId.h"
 
 #include "td/utils/common.h"
+#include "td/utils/HashTableUtils.h"
 #include "td/utils/StringBuilder.h"
 
 namespace td {
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 39c2f863a..12996b657 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -170,7 +170,6 @@
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/Status.h"
 #include "td/utils/Timer.h"
-#include "td/utils/tl_parsers.h"
 #include "td/utils/utf8.h"
 
 #include <limits>
diff --git a/td/telegram/net/MtprotoHeader.h b/td/telegram/net/MtprotoHeader.h
index 2dae30972..5ca9d6094 100644
--- a/td/telegram/net/MtprotoHeader.h
+++ b/td/telegram/net/MtprotoHeader.h
@@ -10,7 +10,6 @@
 
 #include "td/utils/common.h"
 #include "td/utils/port/RwMutex.h"
-#include "td/utils/Slice.h"
 
 namespace td {
 
diff --git a/tddb/td/db/SeqKeyValue.h b/tddb/td/db/SeqKeyValue.h
index b12975cfb..37a79c9d0 100644
--- a/tddb/td/db/SeqKeyValue.h
+++ b/tddb/td/db/SeqKeyValue.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "td/utils/common.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/Slice.h"
 
diff --git a/tdutils/td/utils/ChainScheduler.h b/tdutils/td/utils/ChainScheduler.h
index 1e307023e..f38272da1 100644
--- a/tdutils/td/utils/ChainScheduler.h
+++ b/tdutils/td/utils/ChainScheduler.h
@@ -11,7 +11,6 @@
 #include "td/utils/Container.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/FlatHashSet.h"
-#include "td/utils/HashTableUtils.h"
 #include "td/utils/List.h"
 #include "td/utils/logging.h"
 #include "td/utils/optional.h"
diff --git a/tdutils/test/json.cpp b/tdutils/test/json.cpp
index 0c6d47bf5..110c2c545 100644
--- a/tdutils/test/json.cpp
+++ b/tdutils/test/json.cpp
@@ -173,12 +173,12 @@ TEST(JSON, get_json_object_field) {
   ASSERT_EQ(td::get_json_object_int_field(object, "long2").is_error(), true);
 
   ASSERT_TRUE(td::get_json_object_long_field(object, "null").is_error());
-  ASSERT_EQ(td::get_json_object_long_field(object, "long").ok(), 123456789012ll);
-  ASSERT_EQ(td::get_json_object_long_field(object, "long").ok(), 123456789012ll);
-  ASSERT_EQ(td::get_json_object_long_field(object, "long", false).ok(), 123456789012ll);
-  ASSERT_EQ(td::get_json_object_long_field(object, "long2").ok(), 2123456789012ll);
-  ASSERT_EQ(td::get_json_object_long_field(object, "long2").ok(), 2123456789012ll);
-  ASSERT_EQ(td::get_json_object_long_field(object, "long2", false).ok(), 2123456789012ll);
+  ASSERT_EQ(td::get_json_object_long_field(object, "long").ok(), 123456789012);
+  ASSERT_EQ(td::get_json_object_long_field(object, "long").ok(), 123456789012);
+  ASSERT_EQ(td::get_json_object_long_field(object, "long", false).ok(), 123456789012);
+  ASSERT_EQ(td::get_json_object_long_field(object, "long2").ok(), 2123456789012);
+  ASSERT_EQ(td::get_json_object_long_field(object, "long2").ok(), 2123456789012);
+  ASSERT_EQ(td::get_json_object_long_field(object, "long2", false).ok(), 2123456789012);
   ASSERT_EQ(td::get_json_object_long_field(object, "long3").ok(), 0);
   ASSERT_EQ(td::get_json_object_long_field(object, "long4", true, 5).ok(), 5);
   ASSERT_TRUE(td::get_json_object_long_field(object, "long5", false, 5).is_error());
@@ -296,12 +296,12 @@ TEST(JSON, json_object_get_field) {
   ASSERT_EQ(object.get_optional_int_field("long2").is_error(), true);
 
   ASSERT_TRUE(object.get_optional_long_field("null").is_error());
-  ASSERT_EQ(object.get_optional_long_field("long").ok(), 123456789012ll);
-  ASSERT_EQ(object.get_optional_long_field("long").ok(), 123456789012ll);
-  ASSERT_EQ(object.get_required_long_field("long").ok(), 123456789012ll);
-  ASSERT_EQ(object.get_optional_long_field("long2").ok(), 2123456789012ll);
-  ASSERT_EQ(object.get_optional_long_field("long2").ok(), 2123456789012ll);
-  ASSERT_EQ(object.get_required_long_field("long2").ok(), 2123456789012ll);
+  ASSERT_EQ(object.get_optional_long_field("long").ok(), 123456789012);
+  ASSERT_EQ(object.get_optional_long_field("long").ok(), 123456789012);
+  ASSERT_EQ(object.get_required_long_field("long").ok(), 123456789012);
+  ASSERT_EQ(object.get_optional_long_field("long2").ok(), 2123456789012);
+  ASSERT_EQ(object.get_optional_long_field("long2").ok(), 2123456789012);
+  ASSERT_EQ(object.get_required_long_field("long2").ok(), 2123456789012);
   ASSERT_EQ(object.get_optional_long_field("long3").ok(), 0);
   ASSERT_EQ(object.get_optional_long_field("long4", 5).ok(), 5);
   ASSERT_TRUE(object.get_required_long_field("long5").is_error());