From 1e018da7b8ff01e38a69e74062a424444ceb16e7 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 22 Oct 2019 20:01:15 +0300 Subject: [PATCH] Various fixes. GitOrigin-RevId: b09e5fda6d25bd027f6bcbcbbe8324567b8ddcf8 --- benchmark/bench_db.cpp | 1 + td/generate/scheme/td_api.tl | 8 ++++---- td/telegram/BackgroundManager.cpp | 2 -- td/telegram/ConfigManager.cpp | 1 - td/telegram/ContactsManager.cpp | 2 ++ td/telegram/FileReferenceManager.cpp | 1 + td/telegram/LanguagePackManager.cpp | 1 + td/telegram/MessageContent.cpp | 1 - td/telegram/MessagesManager.cpp | 2 +- td/telegram/UpdatesManager.cpp | 1 + td/telegram/Venue.cpp | 1 + td/telegram/Venue.h | 4 +--- td/telegram/misc.cpp | 1 - td/telegram/net/ConnectionCreator.cpp | 1 - tddb/td/db/BinlogKeyValue.h | 1 + tddb/td/db/binlog/ConcurrentBinlog.h | 1 + tddb/td/db/binlog/binlog_dump.cpp | 2 ++ test/db.cpp | 1 + test/message_entities.cpp | 1 + 19 files changed, 19 insertions(+), 14 deletions(-) diff --git a/benchmark/bench_db.cpp b/benchmark/bench_db.cpp index 96a3a1c32..4b6e14ef6 100644 --- a/benchmark/bench_db.cpp +++ b/benchmark/bench_db.cpp @@ -9,6 +9,7 @@ #include "td/db/binlog/Binlog.h" #include "td/db/binlog/ConcurrentBinlog.h" #include "td/db/BinlogKeyValue.h" +#include "td/db/DbKey.h" #include "td/db/SeqKeyValue.h" #include "td/db/SqliteConnectionSafe.h" #include "td/db/SqliteDb.h" diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 398656802..e86b296d0 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -305,7 +305,7 @@ user id:int32 first_name:string last_name:string username:string phone_number:st //@description Contains full information about a user (except the full list of profile photos) @is_blocked True, if the user is blacklisted by the current user //@can_be_called True, if the user can be called @has_private_calls True, if the user can't be called due to their privacy settings -//@need_phone_number_privacy_exception True, if the current user needs to explicitly allow to share his phone number with the user when the method addContact is used +//@need_phone_number_privacy_exception True, if the current user needs to explicitly allow to share their phone number with the user when the method addContact is used //@bio A short user bio @share_text For bots, the text that is included with the link when users share the bot @group_in_common_count Number of group chats where both the other user and the current user are a member; 0 for the current user @bot_info If the user is a bot, information about the bot; may be null userFullInfo is_blocked:Bool can_be_called:Bool has_private_calls:Bool need_phone_number_privacy_exception:Bool bio:string share_text:string group_in_common_count:int32 bot_info:botInfo = UserFullInfo; @@ -2694,7 +2694,7 @@ updateMessageMentionRead chat_id:int53 message_id:int53 unread_mention_count:int //@description A new chat has been loaded/created. This update is guaranteed to come before the chat identifier is returned to the client. The chat field changes will be reported through separate updates @chat The chat updateNewChat chat:chat = Update; -//@description The list to which the chat belongs was changed. This update is guaranteed to be sent only when chat.order == 0 and the current or the new chat list is null @chat_id Chat identifier @chat_list The new chat's list; may be null +//@description The list to which the chat belongs was changed. This update is guaranteed to be sent only when chat.order == 0 and the current or the new chat list is null @chat_id Chat identifier @chat_list The new chat's chat list; may be null updateChatChatList chat_id:int53 chat_list:ChatList = Update; //@description The title of a chat was changed @chat_id Chat identifier @title The new chat title @@ -3634,8 +3634,8 @@ unblockUser user_id:int32 = Ok; getBlockedUsers offset:int32 limit:int32 = Users; -//@description Adds a user to the contacts list or edits an existing contact by their user_id @contact The contact to add or edit; phone number can be empty and needs to be specified only if known, vCard is ignored -//@share_phone_number True, if the new contact needs to be allowed to see current user's phone number. A corresponding rule to userPrivacySettingShowPhoneNumber will be added if needed. Use the field UserFullInfo.need_phone_number_privacy_exception to check whether the current user needs to be asked to share his phone number +//@description Adds a user to the contact list or edits an existing contact by their user_id @contact The contact to add or edit; phone number can be empty and needs to be specified only if known, vCard is ignored +//@share_phone_number True, if the new contact needs to be allowed to see current user's phone number. A corresponding rule to userPrivacySettingShowPhoneNumber will be added if needed. Use the field UserFullInfo.need_phone_number_privacy_exception to check whether the current user needs to be asked to share their phone number addContact contact:contact share_phone_number:Bool = Ok; //@description Adds new contacts or edits existing contacts by their phone numbers; contacts' user identifiers are ignored @contacts The list of contacts to import or edit; contacts' vCard are ignored and are not imported diff --git a/td/telegram/BackgroundManager.cpp b/td/telegram/BackgroundManager.cpp index ac89b1934..f834ddfab 100644 --- a/td/telegram/BackgroundManager.cpp +++ b/td/telegram/BackgroundManager.cpp @@ -35,8 +35,6 @@ #include "td/utils/Slice.h" #include "td/utils/tl_helpers.h" -#include - namespace td { class GetBackgroundQuery : public Td::ResultHandler { diff --git a/td/telegram/ConfigManager.cpp b/td/telegram/ConfigManager.cpp index d8ae7ab4a..ca054f515 100644 --- a/td/telegram/ConfigManager.cpp +++ b/td/telegram/ConfigManager.cpp @@ -52,7 +52,6 @@ #include "td/utils/tl_parsers.h" #include "td/utils/UInt.h" -#include #include #include diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index fffe06c1f..6e3eb6f8e 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -12,10 +12,12 @@ #include "td/telegram/AuthManager.h" #include "td/telegram/ConfigShared.h" +#include "td/telegram/Dependencies.h" #include "td/telegram/DeviceTokenManager.h" #include "td/telegram/FileReferenceManager.h" #include "td/telegram/files/FileManager.h" #include "td/telegram/files/FileType.h" +#include "td/telegram/FolderId.h" #include "td/telegram/Global.h" #include "td/telegram/InlineQueriesManager.h" #include "td/telegram/logevent/LogEvent.h" diff --git a/td/telegram/FileReferenceManager.cpp b/td/telegram/FileReferenceManager.cpp index 0472366c6..fe4a82d2f 100644 --- a/td/telegram/FileReferenceManager.cpp +++ b/td/telegram/FileReferenceManager.cpp @@ -20,6 +20,7 @@ #include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/overloaded.h" +#include "td/utils/Time.h" namespace td { diff --git a/td/telegram/LanguagePackManager.cpp b/td/telegram/LanguagePackManager.cpp index db848a001..2fe2064df 100644 --- a/td/telegram/LanguagePackManager.cpp +++ b/td/telegram/LanguagePackManager.cpp @@ -19,6 +19,7 @@ #include "td/telegram/td_api.hpp" #include "td/telegram/telegram_api.h" +#include "td/db/DbKey.h" #include "td/db/SqliteDb.h" #include "td/db/SqliteKeyValue.h" diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp index bd24275bb..2e1229209 100644 --- a/td/telegram/MessageContent.cpp +++ b/td/telegram/MessageContent.cpp @@ -73,7 +73,6 @@ #include "td/utils/tl_helpers.h" #include "td/utils/utf8.h" -#include #include namespace td { diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 34e947295..2fec0be93 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -25,6 +25,7 @@ #include "td/telegram/InputMessageText.h" #include "td/telegram/logevent/LogEvent.h" #include "td/telegram/logevent/LogEventHelper.h" +#include "td/telegram/Location.h" #include "td/telegram/MessageContent.h" #include "td/telegram/MessageEntity.hpp" #include "td/telegram/MessagesDb.h" @@ -42,7 +43,6 @@ #include "td/telegram/SecretChatActor.h" #include "td/telegram/SecretChatsManager.h" #include "td/telegram/SequenceDispatcher.h" -#include "td/telegram/StickerSetId.h" #include "td/telegram/Td.h" #include "td/telegram/TdDb.h" #include "td/telegram/TopDialogManager.h" diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp index c06b3bf55..085c8cfe9 100644 --- a/td/telegram/UpdatesManager.cpp +++ b/td/telegram/UpdatesManager.cpp @@ -34,6 +34,7 @@ #include "td/telegram/SecretChatId.h" #include "td/telegram/SecretChatsManager.h" #include "td/telegram/StateManager.h" +#include "td/telegram/StickerSetId.h" #include "td/telegram/StickersManager.h" #include "td/telegram/Td.h" #include "td/telegram/TdDb.h" diff --git a/td/telegram/Venue.cpp b/td/telegram/Venue.cpp index 3b2bec47b..d792f5bdb 100644 --- a/td/telegram/Venue.cpp +++ b/td/telegram/Venue.cpp @@ -7,6 +7,7 @@ #include "td/telegram/Venue.h" #include "td/telegram/misc.h" +#include "td/telegram/secret_api.h" namespace td { diff --git a/td/telegram/Venue.h b/td/telegram/Venue.h index 8ff92e5e2..9f904e175 100644 --- a/td/telegram/Venue.h +++ b/td/telegram/Venue.h @@ -8,11 +8,9 @@ #include "td/telegram/Location.h" #include "td/telegram/SecretInputMedia.h" -#include "td/telegram/Version.h" - -#include "td/telegram/secret_api.h" #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" +#include "td/telegram/Version.h" #include "td/utils/common.h" #include "td/utils/Status.h" diff --git a/td/telegram/misc.cpp b/td/telegram/misc.cpp index 9243b1d4b..b5ced176c 100644 --- a/td/telegram/misc.cpp +++ b/td/telegram/misc.cpp @@ -13,7 +13,6 @@ #include "td/utils/Slice.h" #include "td/utils/utf8.h" -#include #include #include diff --git a/td/telegram/net/ConnectionCreator.cpp b/td/telegram/net/ConnectionCreator.cpp index da88b3fdd..c4f3f60a7 100644 --- a/td/telegram/net/ConnectionCreator.cpp +++ b/td/telegram/net/ConnectionCreator.cpp @@ -39,7 +39,6 @@ #include "td/utils/Time.h" #include "td/utils/tl_helpers.h" -#include #include namespace td { diff --git a/tddb/td/db/BinlogKeyValue.h b/tddb/td/db/BinlogKeyValue.h index 8649e7ba0..1e858a1dc 100644 --- a/tddb/td/db/BinlogKeyValue.h +++ b/tddb/td/db/BinlogKeyValue.h @@ -10,6 +10,7 @@ #include "td/db/binlog/Binlog.h" #include "td/db/binlog/BinlogEvent.h" +#include "td/db/DbKey.h" #include "td/db/KeyValueSyncInterface.h" #include "td/utils/buffer.h" diff --git a/tddb/td/db/binlog/ConcurrentBinlog.h b/tddb/td/db/binlog/ConcurrentBinlog.h index 6cac41398..e8c5bb342 100644 --- a/tddb/td/db/binlog/ConcurrentBinlog.h +++ b/tddb/td/db/binlog/ConcurrentBinlog.h @@ -11,6 +11,7 @@ #include "td/db/binlog/Binlog.h" #include "td/db/binlog/BinlogInterface.h" +#include "td/db/DbKey.h" #include "td/utils/buffer.h" #include "td/utils/common.h" diff --git a/tddb/td/db/binlog/binlog_dump.cpp b/tddb/td/db/binlog/binlog_dump.cpp index 50c1407dd..a5e8bd9ae 100644 --- a/tddb/td/db/binlog/binlog_dump.cpp +++ b/tddb/td/db/binlog/binlog_dump.cpp @@ -6,6 +6,8 @@ // #include "td/db/binlog/Binlog.h" +#include "td/db/DbKey.h" + #include "td/utils/common.h" #include "td/utils/format.h" #include "td/utils/logging.h" diff --git a/test/db.cpp b/test/db.cpp index 69687bb0c..582aed1bf 100644 --- a/test/db.cpp +++ b/test/db.cpp @@ -7,6 +7,7 @@ #include "td/db/binlog/BinlogHelper.h" #include "td/db/binlog/ConcurrentBinlog.h" #include "td/db/BinlogKeyValue.h" +#include "td/db/DbKey.h" #include "td/db/SeqKeyValue.h" #include "td/db/SqliteConnectionSafe.h" #include "td/db/SqliteDb.h" diff --git a/test/message_entities.cpp b/test/message_entities.cpp index c8fcd1a45..8b759cebc 100644 --- a/test/message_entities.cpp +++ b/test/message_entities.cpp @@ -9,6 +9,7 @@ #include "td/utils/common.h" #include "td/utils/format.h" #include "td/utils/logging.h" +#include "td/utils/Slice.h" #include "td/utils/tests.h" #include "td/utils/utf8.h"