From 6de2763fac75a51001856fef9eae408ca4084207 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 8 Nov 2021 16:41:16 +0300 Subject: [PATCH] Remove duplicate logging before net queries. --- td/telegram/AnimationsManager.cpp | 1 - td/telegram/BackgroundManager.cpp | 1 - td/telegram/ContactsManager.cpp | 7 ------- td/telegram/GameManager.cpp | 2 -- td/telegram/MessagesManager.cpp | 35 ++----------------------------- td/telegram/StickersManager.cpp | 12 +---------- 6 files changed, 3 insertions(+), 55 deletions(-) diff --git a/td/telegram/AnimationsManager.cpp b/td/telegram/AnimationsManager.cpp index d92bb6c8c..74a1092ad 100644 --- a/td/telegram/AnimationsManager.cpp +++ b/td/telegram/AnimationsManager.cpp @@ -45,7 +45,6 @@ class GetSavedGifsQuery final : public Td::ResultHandler { public: void send(bool is_repair, int64 hash) { is_repair_ = is_repair; - LOG(INFO) << "Send get saved animations request with hash = " << hash; send_query(G()->net_query_creator().create(telegram_api::messages_getSavedGifs(hash))); } diff --git a/td/telegram/BackgroundManager.cpp b/td/telegram/BackgroundManager.cpp index 6fdfd782c..95aaba445 100644 --- a/td/telegram/BackgroundManager.cpp +++ b/td/telegram/BackgroundManager.cpp @@ -50,7 +50,6 @@ class GetBackgroundQuery final : public Td::ResultHandler { telegram_api::object_ptr &&input_wallpaper) { background_id_ = background_id; background_name_ = background_name; - LOG(INFO) << "Load " << background_id_ << "/" << background_name_ << " from server"; send_query(G()->net_query_creator().create(telegram_api::account_getWallPaper(std::move(input_wallpaper)))); } diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index 36310b960..e28064bf9 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -392,7 +392,6 @@ class ResetWebAuthorizationsQuery final : public Td::ResultHandler { class GetContactsQuery final : public Td::ResultHandler { public: void send(int64 hash) { - LOG(INFO) << "Reload contacts with hash " << hash; send_query(G()->net_query_creator().create(telegram_api::contacts_getContacts(hash))); } @@ -416,7 +415,6 @@ class GetContactsQuery final : public Td::ResultHandler { class GetContactsStatusesQuery final : public Td::ResultHandler { public: void send() { - LOG(INFO) << "Reload contacts statuses"; send_query(G()->net_query_creator().create(telegram_api::contacts_getStatuses())); } @@ -1445,8 +1443,6 @@ class ReportChannelSpamQuery final : public Td::ResultHandler { } void send(ChannelId channel_id, UserId user_id, const vector &message_ids) { - LOG(INFO) << "Send reportChannelSpamQuery in " << channel_id << " with messages " << format::as_array(message_ids) - << " and " << user_id; channel_id_ = channel_id; auto input_channel = td_->contacts_manager_->get_input_channel(channel_id); @@ -2805,8 +2801,6 @@ class GetUserPhotosQuery final : public Td::ResultHandler { user_id_ = user_id; offset_ = offset; limit_ = limit; - LOG(INFO) << "Get " << user_id << " profile photos with offset " << offset << " and limit " << limit - << " from photo " << photo_id; send_query(G()->net_query_creator().create( telegram_api::photos_getUserPhotos(std::move(input_user), offset, photo_id, limit))); } @@ -2895,7 +2889,6 @@ class GetFullChatQuery final : public Td::ResultHandler { } void send(ChatId chat_id) { - LOG(INFO) << "Send getFullChat query to get " << chat_id; send_query(G()->net_query_creator().create(telegram_api::messages_getFullChat(chat_id.get()))); } diff --git a/td/telegram/GameManager.cpp b/td/telegram/GameManager.cpp index ec0e28167..81bbfb482 100644 --- a/td/telegram/GameManager.cpp +++ b/td/telegram/GameManager.cpp @@ -60,8 +60,6 @@ class SetGameScoreActor final : public NetActorOnce { telegram_api::messages_setGameScore(flags, false /*ignored*/, false /*ignored*/, std::move(input_peer), message_id.get_server_message_id().get(), std::move(input_user), score)); - LOG(INFO) << "Set game score to " << score; - query->debug("send to MultiSequenceDispatcher"); send_closure(td_->messages_manager_->sequence_dispatcher_, &MultiSequenceDispatcher::send_with_callback, std::move(query), actor_shared(this), sequence_dispatcher_id); diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 94e4ca608..accfca466 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -269,7 +269,7 @@ class GetDialogQuery final : public Td::ResultHandler { } auto result = result_ptr.move_as_ok(); - LOG(INFO) << "Receive chat: " << to_string(result); + LOG(INFO) << "Receive result for GetDialogQuery: " << to_string(result); td_->contacts_manager_->on_get_users(std::move(result->users_), "GetDialogQuery"); td_->contacts_manager_->on_get_chats(std::move(result->chats_), "GetDialogQuery"); @@ -296,7 +296,6 @@ class GetDialogsQuery final : public Td::ResultHandler { } void send(vector input_dialog_ids) { - LOG(INFO) << "Send GetDialogsQuery to get " << input_dialog_ids; CHECK(!input_dialog_ids.empty()); CHECK(input_dialog_ids.size() <= 100); auto input_dialog_peers = InputDialogId::get_input_dialog_peers(input_dialog_ids); @@ -311,7 +310,7 @@ class GetDialogsQuery final : public Td::ResultHandler { } auto result = result_ptr.move_as_ok(); - LOG(INFO) << "Receive chats: " << to_string(result); + LOG(INFO) << "Receive result for GetDialogsQuery: " << to_string(result); td_->contacts_manager_->on_get_users(std::move(result->users_), "GetDialogsQuery"); td_->contacts_manager_->on_get_chats(std::move(result->chats_), "GetDialogsQuery"); @@ -862,7 +861,6 @@ class GetCommonDialogsQuery final : public Td::ResultHandler { void send(UserId user_id, int64 offset_chat_id, int32 limit) { user_id_ = user_id; offset_chat_id_ = offset_chat_id; - LOG(INFO) << "Get common dialogs with " << user_id << " from " << offset_chat_id << " with limit " << limit; auto input_user = td_->contacts_manager_->get_input_user(user_id); CHECK(input_user != nullptr); @@ -1514,7 +1512,6 @@ class SaveDraftMessageQuery final : public Td::ResultHandler { } void send(DialogId dialog_id, const unique_ptr &draft_message) { - LOG(INFO) << "Save draft in " << dialog_id; dialog_id_ = dialog_id; auto input_peer = td_->messages_manager_->get_input_peer(dialog_id, AccessRights::Write); @@ -1680,8 +1677,6 @@ class ReorderPinnedDialogsQuery final : public Td::ResultHandler { if (!result) { return on_error(Status::Error(400, "Result is false")); } - LOG(INFO) << "Pinned chats reordered in " << folder_id_; - promise_.set_value(Unit()); } @@ -1807,8 +1802,6 @@ class GetMessagesViewsQuery final : public Td::ResultHandler { return on_error(Status::Error(400, "Can't access the chat")); } - LOG(INFO) << "View " << message_ids_.size() << " messages in " << dialog_id - << ", increment = " << increment_view_counter; send_query(G()->net_query_creator().create(telegram_api::messages_getMessagesViews( std::move(input_peer), MessagesManager::get_server_message_ids(message_ids_), increment_view_counter))); } @@ -1853,8 +1846,6 @@ class ReadMessagesContentsQuery final : public Td::ResultHandler { } void send(vector &&message_ids) { - LOG(INFO) << "Receive ReadMessagesContentsQuery for messages " << format::as_array(message_ids); - send_query(G()->net_query_creator().create( telegram_api::messages_readMessageContents(MessagesManager::get_server_message_ids(message_ids)))); } @@ -1902,9 +1893,6 @@ class ReadChannelMessagesContentsQuery final : public Td::ResultHandler { return on_error(Status::Error(500, "Can't read channel message contents")); } - LOG(INFO) << "Receive ReadChannelMessagesContentsQuery for messages " << format::as_array(message_ids) << " in " - << channel_id; - send_query(G()->net_query_creator().create(telegram_api::channels_readMessageContents( std::move(input_channel), MessagesManager::get_server_message_ids(message_ids)))); } @@ -2694,7 +2682,6 @@ class DeleteHistoryQuery final : public Td::ResultHandler { if (revoke_) { flags |= telegram_api::messages_deleteHistory::REVOKE_MASK; } - LOG(INFO) << "Delete " << dialog_id_ << " history up to " << max_message_id_ << " with flags " << flags; send_query(G()->net_query_creator().create( telegram_api::messages_deleteHistory(flags, false /*ignored*/, false /*ignored*/, std::move(input_peer), @@ -2961,8 +2948,6 @@ class DeleteUserHistoryQuery final : public Td::ResultHandler { return promise_.set_error(Status::Error(400, "Usat is not accessible")); } - LOG(INFO) << "Delete all messages from " << user_id_ << " in " << channel_id_; - send_query(G()->net_query_creator().create( telegram_api::channels_deleteUserHistory(std::move(input_channel), std::move(input_user)))); } @@ -3017,8 +3002,6 @@ class ReadMentionsQuery final : public Td::ResultHandler { return promise_.set_error(Status::Error(400, "Chat is not accessible")); } - LOG(INFO) << "Read all mentions in " << dialog_id_; - send_query(G()->net_query_creator().create(telegram_api::messages_readMentions(std::move(input_peer)))); } @@ -3609,8 +3592,6 @@ class SendScheduledMessageActor final : public NetActorOnce { return; } - LOG(DEBUG) << "Send " << FullMessageId{dialog_id, message_id}; - int32 server_message_id = message_id.get_scheduled_server_message_id().get(); auto query = G()->net_query_creator().create( telegram_api::messages_sendScheduledMessages(std::move(input_peer), {server_message_id})); @@ -3690,7 +3671,6 @@ class EditMessageActor final : public NetActorOnce { if (schedule_date != 0) { flags |= telegram_api::messages_editMessage::SCHEDULE_DATE_MASK; } - LOG(DEBUG) << "Edit message with flags " << flags; int32 server_message_id = schedule_date != 0 ? message_id.get_scheduled_server_message_id().get() : message_id.get_server_message_id().get(); @@ -3756,7 +3736,6 @@ class EditInlineMessageQuery final : public Td::ResultHandler { if (input_media != nullptr) { flags |= telegram_api::messages_editInlineBotMessage::MEDIA_MASK; } - LOG(DEBUG) << "Edit inline message with flags " << flags; auto dc_id = DcId::internal(InlineQueriesManager::get_inline_message_dc_id(input_bot_inline_message_id)); send_query(G()->net_query_creator().create( @@ -3794,8 +3773,6 @@ class ForwardMessagesActor final : public NetActorOnce { void send(int32 flags, DialogId to_dialog_id, DialogId from_dialog_id, const vector &message_ids, vector &&random_ids, int32 schedule_date, uint64 sequence_dispatcher_id) { - LOG(INFO) << "Forward " << format::as_array(message_ids) << " from " << from_dialog_id << " to " << to_dialog_id; - random_ids_ = random_ids; to_dialog_id_ = to_dialog_id; @@ -3997,7 +3974,6 @@ class DeleteMessagesQuery final : public Td::ResultHandler { } void send(DialogId dialog_id, vector &&message_ids, bool revoke) { - LOG(INFO) << "Send deleteMessagesQuery to delete " << format::as_array(message_ids) << " in " << dialog_id; dialog_id_ = dialog_id; int32 flags = 0; if (revoke) { @@ -4061,9 +4037,6 @@ class DeleteChannelMessagesQuery final : public Td::ResultHandler { void send(ChannelId channel_id, vector &&message_ids) { channel_id_ = channel_id; - LOG(INFO) << "Send deleteChannelMessagesQuery to delete " << format::as_array(message_ids) << " in the " - << channel_id; - query_count_ = 0; auto server_message_ids = MessagesManager::get_server_message_ids(message_ids); const size_t MAX_SLICE_SIZE = 100; @@ -4119,7 +4092,6 @@ class DeleteScheduledMessagesQuery final : public Td::ResultHandler { void send(DialogId dialog_id, vector &&message_ids) { dialog_id_ = dialog_id; - LOG(INFO) << "Send deleteScheduledMessagesQuery to delete " << format::as_array(message_ids); auto input_peer = td_->messages_manager_->get_input_peer(dialog_id, AccessRights::Read); if (input_peer == nullptr) { @@ -4500,7 +4472,6 @@ class ReportEncryptedSpamQuery final : public Td::ResultHandler { auto input_peer = td_->messages_manager_->get_input_encrypted_chat(dialog_id, AccessRights::Read); CHECK(input_peer != nullptr); - LOG(INFO) << "Report spam in " << to_string(input_peer); send_query(G()->net_query_creator().create(telegram_api::messages_reportEncryptedSpam(std::move(input_peer)))); } @@ -4733,8 +4704,6 @@ class ResolveUsernameQuery final : public Td::ResultHandler { void send(const string &username) { username_ = username; - - LOG(INFO) << "Send ResolveUsernameQuery with username = " << username; send_query(G()->net_query_creator().create(telegram_api::contacts_resolveUsername(username))); } diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp index 50f2df5c5..52def43ee 100644 --- a/td/telegram/StickersManager.cpp +++ b/td/telegram/StickersManager.cpp @@ -251,15 +251,11 @@ class GetArchivedStickerSetsQuery final : public Td::ResultHandler { void send(bool is_masks, StickerSetId offset_sticker_set_id, int32 limit) { offset_sticker_set_id_ = offset_sticker_set_id; is_masks_ = is_masks; - LOG(INFO) << "Get archived " << (is_masks ? "mask" : "sticker") << " sets from " << offset_sticker_set_id - << " with limit " << limit; int32 flags = 0; - if (is_masks) { + if (is_masks_) { flags |= telegram_api::messages_getArchivedStickers::MASKS_MASK; } - is_masks_ = is_masks; - send_query(G()->net_query_creator().create( telegram_api::messages_getArchivedStickers(flags, is_masks /*ignored*/, offset_sticker_set_id.get(), limit))); } @@ -286,7 +282,6 @@ class GetArchivedStickerSetsQuery final : public Td::ResultHandler { class GetFeaturedStickerSetsQuery final : public Td::ResultHandler { public: void send(int64 hash) { - LOG(INFO) << "Get trending sticker sets with hash " << hash; send_query(G()->net_query_creator().create(telegram_api::messages_getFeaturedStickers(hash))); } @@ -316,7 +311,6 @@ class GetOldFeaturedStickerSetsQuery final : public Td::ResultHandler { offset_ = offset; limit_ = limit; generation_ = generation; - LOG(INFO) << "Get old trending sticker sets with offset = " << offset << " and limit = " << limit; send_query(G()->net_query_creator().create(telegram_api::messages_getOldFeaturedStickers(offset, limit, 0))); } @@ -541,7 +535,6 @@ class GetFavedStickersQuery final : public Td::ResultHandler { public: void send(bool is_repair, int64 hash) { is_repair_ = is_repair; - LOG(INFO) << "Send get favorite stickers request with hash = " << hash; send_query(G()->net_query_creator().create(telegram_api::messages_getFavedStickers(hash))); } @@ -673,8 +666,6 @@ class GetStickerSetQuery final : public Td::ResultHandler { sticker_set_name_ = static_cast(input_sticker_set.get())->short_name_; } - // input_sticker_set = make_tl_object(); - LOG(INFO) << "Load " << sticker_set_id << " from server: " << to_string(input_sticker_set); send_query(G()->net_query_creator().create(telegram_api::messages_getStickerSet(std::move(input_sticker_set)))); } @@ -838,7 +829,6 @@ class UninstallStickerSetQuery final : public Td::ResultHandler { class ReadFeaturedStickerSetsQuery final : public Td::ResultHandler { public: void send(const vector &sticker_set_ids) { - LOG(INFO) << "Read trending sticker sets " << format::as_array(sticker_set_ids); send_query(G()->net_query_creator().create( telegram_api::messages_readFeaturedStickers(StickersManager::convert_sticker_set_ids(sticker_set_ids)))); }