From 82e59914cddc9eb913391fe053244017e31953e2 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 8 Jan 2024 15:42:21 +0300 Subject: [PATCH] Minor improvements. --- CMakeLists.txt | 4 ++-- td/telegram/BotCommand.cpp | 2 ++ td/telegram/CommonDialogManager.cpp | 3 +++ td/telegram/ContactsManager.cpp | 1 + td/telegram/ContactsManager.h | 1 - td/telegram/DialogActionManager.cpp | 4 ++++ td/telegram/DialogActionManager.h | 2 +- td/telegram/DialogInviteLinkManager.cpp | 1 + td/telegram/DialogInviteLinkManager.h | 1 + td/telegram/DialogManager.cpp | 3 +++ td/telegram/DialogManager.h | 1 + td/telegram/DialogParticipantManager.cpp | 11 ++++++++++- td/telegram/DialogParticipantManager.h | 1 + 13 files changed, 30 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d747c56a..6845eb7db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -333,9 +333,9 @@ set(TDLIB_SOURCE td/telegram/DialogLocation.cpp td/telegram/DialogManager.cpp td/telegram/DialogNotificationSettings.cpp - td/telegram/DialogParticipantManager.cpp td/telegram/DialogParticipant.cpp td/telegram/DialogParticipantFilter.cpp + td/telegram/DialogParticipantManager.cpp td/telegram/DialogSource.cpp td/telegram/Dimensions.cpp td/telegram/Document.cpp @@ -615,9 +615,9 @@ set(TDLIB_SOURCE td/telegram/DialogLocation.h td/telegram/DialogManager.h td/telegram/DialogNotificationSettings.h - td/telegram/DialogParticipantManager.h td/telegram/DialogParticipant.h td/telegram/DialogParticipantFilter.h + td/telegram/DialogParticipantManager.h td/telegram/DialogSource.h td/telegram/Dimensions.h td/telegram/Document.h diff --git a/td/telegram/BotCommand.cpp b/td/telegram/BotCommand.cpp index ae9bcef67..da8142577 100644 --- a/td/telegram/BotCommand.cpp +++ b/td/telegram/BotCommand.cpp @@ -21,6 +21,8 @@ #include "td/utils/Status.h" #include "td/utils/utf8.h" +#include + namespace td { class SetBotCommandsQuery final : public Td::ResultHandler { diff --git a/td/telegram/CommonDialogManager.cpp b/td/telegram/CommonDialogManager.cpp index 2892f5d13..200200f53 100644 --- a/td/telegram/CommonDialogManager.cpp +++ b/td/telegram/CommonDialogManager.cpp @@ -14,6 +14,9 @@ #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" +#include "td/utils/Time.h" #include diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index 996169315..a97356898 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -15,6 +15,7 @@ #include "td/telegram/CommonDialogManager.h" #include "td/telegram/ConfigManager.h" #include "td/telegram/Dependencies.h" +#include "td/telegram/DialogAdministrator.h" #include "td/telegram/DialogInviteLink.h" #include "td/telegram/DialogInviteLinkManager.h" #include "td/telegram/DialogLocation.h" diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h index f8b6a8188..c3ca2a56a 100644 --- a/td/telegram/ContactsManager.h +++ b/td/telegram/ContactsManager.h @@ -15,7 +15,6 @@ #include "td/telegram/ChatId.h" #include "td/telegram/Contact.h" #include "td/telegram/CustomEmojiId.h" -#include "td/telegram/DialogAdministrator.h" #include "td/telegram/DialogId.h" #include "td/telegram/DialogInviteLink.h" #include "td/telegram/DialogLocation.h" diff --git a/td/telegram/DialogActionManager.cpp b/td/telegram/DialogActionManager.cpp index 9d67139dd..1754eacfb 100644 --- a/td/telegram/DialogActionManager.cpp +++ b/td/telegram/DialogActionManager.cpp @@ -6,6 +6,7 @@ // #include "td/telegram/DialogActionManager.h" +#include "td/telegram/AccessRights.h" #include "td/telegram/AuthManager.h" #include "td/telegram/ContactsManager.h" #include "td/telegram/DialogManager.h" @@ -14,13 +15,16 @@ #include "td/telegram/MessagesManager.h" #include "td/telegram/net/NetQuery.h" #include "td/telegram/SecretChatsManager.h" +#include "td/telegram/ServerMessageId.h" #include "td/telegram/StickersManager.h" #include "td/telegram/Td.h" +#include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" #include "td/utils/emoji.h" #include "td/utils/logging.h" +#include "td/utils/Status.h" #include "td/utils/Time.h" #include diff --git a/td/telegram/DialogActionManager.h b/td/telegram/DialogActionManager.h index bfc9b5374..3cd87a6cf 100644 --- a/td/telegram/DialogActionManager.h +++ b/td/telegram/DialogActionManager.h @@ -11,13 +11,13 @@ #include "td/telegram/MessageContentType.h" #include "td/telegram/MessageId.h" #include "td/telegram/net/NetQuery.h" -#include "td/telegram/td_api.h" #include "td/actor/actor.h" #include "td/actor/MultiTimeout.h" #include "td/utils/common.h" #include "td/utils/FlatHashMap.h" +#include "td/utils/Promise.h" namespace td { diff --git a/td/telegram/DialogInviteLinkManager.cpp b/td/telegram/DialogInviteLinkManager.cpp index c0aecff84..64865db27 100644 --- a/td/telegram/DialogInviteLinkManager.cpp +++ b/td/telegram/DialogInviteLinkManager.cpp @@ -6,6 +6,7 @@ // #include "td/telegram/DialogInviteLinkManager.h" +#include "td/telegram/AccessRights.h" #include "td/telegram/ChannelId.h" #include "td/telegram/ChatId.h" #include "td/telegram/ContactsManager.h" diff --git a/td/telegram/DialogInviteLinkManager.h b/td/telegram/DialogInviteLinkManager.h index 39765991c..b073aa848 100644 --- a/td/telegram/DialogInviteLinkManager.h +++ b/td/telegram/DialogInviteLinkManager.h @@ -20,6 +20,7 @@ #include "td/utils/FlatHashMap.h" #include "td/utils/FlatHashSet.h" #include "td/utils/Promise.h" +#include "td/utils/Status.h" namespace td { diff --git a/td/telegram/DialogManager.cpp b/td/telegram/DialogManager.cpp index ff7204912..42eecbe30 100644 --- a/td/telegram/DialogManager.cpp +++ b/td/telegram/DialogManager.cpp @@ -31,6 +31,9 @@ #include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/Slice.h" +#include "td/utils/Time.h" + +#include namespace td { diff --git a/td/telegram/DialogManager.h b/td/telegram/DialogManager.h index a0a9246c1..38593d44c 100644 --- a/td/telegram/DialogManager.h +++ b/td/telegram/DialogManager.h @@ -25,6 +25,7 @@ #include "td/utils/common.h" #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" diff --git a/td/telegram/DialogParticipantManager.cpp b/td/telegram/DialogParticipantManager.cpp index e0c7dd8e5..bc2e9345d 100644 --- a/td/telegram/DialogParticipantManager.cpp +++ b/td/telegram/DialogParticipantManager.cpp @@ -6,7 +6,9 @@ // #include "td/telegram/DialogParticipantManager.h" +#include "td/telegram/AccessRights.h" #include "td/telegram/AuthManager.h" +#include "td/telegram/ChannelId.h" #include "td/telegram/ContactsManager.h" #include "td/telegram/DialogManager.h" #include "td/telegram/Global.h" @@ -15,17 +17,24 @@ #include "td/telegram/misc.h" #include "td/telegram/Td.h" #include "td/telegram/TdDb.h" +#include "td/telegram/telegram_api.h" #include "td/telegram/UpdatesManager.h" #include "td/db/SqliteKeyValueAsync.h" +#include "td/actor/MultiPromise.h" + #include "td/utils/algorithm.h" #include "td/utils/buffer.h" +#include "td/utils/format.h" #include "td/utils/logging.h" +#include "td/utils/misc.h" +#include "td/utils/SliceBuilder.h" #include "td/utils/Status.h" #include "td/utils/Time.h" #include +#include namespace td { @@ -685,7 +694,7 @@ void DialogParticipantManager::on_load_administrator_users_finished( void DialogParticipantManager::on_update_dialog_administrators(DialogId dialog_id, vector &&administrators, bool have_access, bool from_database) { - LOG(INFO) << "Update administrators in " << dialog_id << " to " << format::as_array(administrators); + LOG(INFO) << "Update administrators in " << dialog_id << " to " << administrators; if (have_access) { CHECK(dialog_id.is_valid()); std::sort(administrators.begin(), administrators.end(), diff --git a/td/telegram/DialogParticipantManager.h b/td/telegram/DialogParticipantManager.h index 0d2d1455f..0906e664b 100644 --- a/td/telegram/DialogParticipantManager.h +++ b/td/telegram/DialogParticipantManager.h @@ -10,6 +10,7 @@ #include "td/telegram/DialogId.h" #include "td/telegram/DialogParticipant.h" #include "td/telegram/td_api.h" +#include "td/telegram/UserId.h" #include "td/actor/actor.h" #include "td/actor/MultiTimeout.h"