From 969b52cc82fe70b3a310e2c9eaed4e847f2d41d2 Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 9 Apr 2021 02:35:50 +0300 Subject: [PATCH] Minor improvements. --- td/telegram/DialogFilter.cpp | 6 +++--- td/telegram/DialogParticipant.h | 1 + td/telegram/MessageContent.cpp | 1 - td/telegram/MessagesManager.cpp | 8 ++++---- td/telegram/Payments.cpp | 1 + td/telegram/Payments.h | 1 + td/telegram/SecretChatActor.h | 2 +- tdnet/td/net/Wget.cpp | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/td/telegram/DialogFilter.cpp b/td/telegram/DialogFilter.cpp index 4717d6e63..a67f120b7 100644 --- a/td/telegram/DialogFilter.cpp +++ b/td/telegram/DialogFilter.cpp @@ -90,15 +90,15 @@ Status DialogFilter::check_limits() const { if (excluded_server_dialog_count > MAX_INCLUDED_FILTER_DIALOGS || excluded_secret_dialog_count > MAX_INCLUDED_FILTER_DIALOGS) { - return Status::Error(400, "Maximum number of excluded chats exceeded"); + return Status::Error(400, "The maximum number of excluded chats exceeded"); } if (included_server_dialog_count > MAX_INCLUDED_FILTER_DIALOGS || included_secret_dialog_count > MAX_INCLUDED_FILTER_DIALOGS) { - return Status::Error(400, "Maximum number of included chats exceeded"); + return Status::Error(400, "The maximum number of included chats exceeded"); } if (included_server_dialog_count + pinned_server_dialog_count > MAX_INCLUDED_FILTER_DIALOGS || included_secret_dialog_count + pinned_secret_dialog_count > MAX_INCLUDED_FILTER_DIALOGS) { - return Status::Error(400, "Maximum number of pinned chats exceeded"); + return Status::Error(400, "The maximum number of pinned chats exceeded"); } if (is_empty(false)) { diff --git a/td/telegram/DialogParticipant.h b/td/telegram/DialogParticipant.h index b6e5bc42a..f3665d8e1 100644 --- a/td/telegram/DialogParticipant.h +++ b/td/telegram/DialogParticipant.h @@ -11,6 +11,7 @@ #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" #include "td/telegram/UserId.h" +#include "td/telegram/Version.h" #include "td/utils/common.h" #include "td/utils/StringBuilder.h" diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp index 2b863c8ce..feebce40e 100644 --- a/td/telegram/MessageContent.cpp +++ b/td/telegram/MessageContent.cpp @@ -51,7 +51,6 @@ #include "td/telegram/secret_api.hpp" #include "td/telegram/SecureValue.h" #include "td/telegram/SecureValue.hpp" -#include "td/telegram/ServerMessageId.h" #include "td/telegram/StickersManager.h" #include "td/telegram/StickersManager.hpp" #include "td/telegram/Td.h" diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 245ce5b8a..26cc52e12 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -17905,7 +17905,7 @@ void MessagesManager::create_dialog_filter(td_api::object_ptr> &&promise) { CHECK(!td_->auth_manager_->is_bot()); if (dialog_filters_.size() >= MAX_DIALOG_FILTERS) { - return promise.set_error(Status::Error(400, "Maximum number of chat folders exceeded")); + return promise.set_error(Status::Error(400, "The maximum number of chat folders exceeded")); } if (!is_update_chat_filters_sent_) { return promise.set_error(Status::Error(400, "Chat folders are not synchronized yet")); @@ -18741,7 +18741,7 @@ Status MessagesManager::toggle_dialog_is_pinned(DialogListId dialog_list_id, Dia : pinned_dialog_count - secret_pinned_dialog_count; if (dialog_count >= static_cast(get_pinned_dialogs_limit(dialog_list_id))) { - return Status::Error(400, "Maximum number of pinned chats exceeded"); + return Status::Error(400, "The maximum number of pinned chats exceeded"); } } @@ -18824,7 +18824,7 @@ Status MessagesManager::set_pinned_dialogs(DialogListId dialog_list_id, vector dialog_count_limit || secret_dialog_count > dialog_count_limit) { - return Status::Error(400, "Maximum number of pinned chats exceeded"); + return Status::Error(400, "The maximum number of pinned chats exceeded"); } } std::unordered_set new_pinned_dialog_ids(dialog_ids.begin(), dialog_ids.end()); @@ -37387,7 +37387,7 @@ Result MessagesManager::get_payment_successful_message_id(FullM return Status::Error(5, "Message has wrong type"); } if (m->message_id.is_scheduled()) { - return Status::Error(5, "Wrong sheduled message identifier"); + return Status::Error(5, "Wrong scheduled message identifier"); } if (!m->message_id.is_server()) { return Status::Error(5, "Wrong message identifier"); diff --git a/td/telegram/Payments.cpp b/td/telegram/Payments.cpp index 90b01271e..efac029e2 100644 --- a/td/telegram/Payments.cpp +++ b/td/telegram/Payments.cpp @@ -6,6 +6,7 @@ // #include "td/telegram/Payments.h" +#include "td/telegram/AccessRights.h" #include "td/telegram/ContactsManager.h" #include "td/telegram/files/FileManager.h" #include "td/telegram/files/FileType.h" diff --git a/td/telegram/Payments.h b/td/telegram/Payments.h index ecfdce141..5415c0091 100644 --- a/td/telegram/Payments.h +++ b/td/telegram/Payments.h @@ -9,6 +9,7 @@ #include "td/actor/PromiseFuture.h" #include "td/telegram/DialogId.h" +#include "td/telegram/files/FileId.h" #include "td/telegram/FullMessageId.h" #include "td/telegram/MessageId.h" #include "td/telegram/Photo.h" diff --git a/td/telegram/SecretChatActor.h b/td/telegram/SecretChatActor.h index c2a5e6747..957605708 100644 --- a/td/telegram/SecretChatActor.h +++ b/td/telegram/SecretChatActor.h @@ -11,9 +11,9 @@ #include "td/telegram/logevent/SecretChatEvent.h" #include "td/telegram/MessageId.h" #include "td/telegram/net/NetQuery.h" +#include "td/telegram/secret_api.h" #include "td/telegram/SecretChatDb.h" #include "td/telegram/SecretChatId.h" -#include "td/telegram/secret_api.h" #include "td/telegram/telegram_api.h" #include "td/telegram/UserId.h" diff --git a/tdnet/td/net/Wget.cpp b/tdnet/td/net/Wget.cpp index 7f961e3a6..a54396b74 100644 --- a/tdnet/td/net/Wget.cpp +++ b/tdnet/td/net/Wget.cpp @@ -75,7 +75,7 @@ Status Wget::try_init() { TRY_RESULT(fd, SocketFd::open(addr)); if (fd.empty()) { - return td::Status::Error("Sockets are not supported"); + return Status::Error("Sockets are not supported"); } if (url.protocol_ == HttpUrl::Protocol::Http) { connection_ = create_actor("Connect", std::move(fd), SslStream{},