From 9447ce07ea0431ee830f353e2314d6bcdea7a00d Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 4 Nov 2023 02:39:57 +0300 Subject: [PATCH] Minor improvements. --- telegram-bot-api/Client.cpp | 15 ++++----------- telegram-bot-api/Client.h | 4 ++-- telegram-bot-api/Stats.h | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index c7de091..039e8bc 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -5160,14 +5160,12 @@ void Client::on_update(object_ptr result) { auto update = move_object_as(result); auto chat = std::move(update->chat_); auto chat_info = add_chat(chat->id_); - bool need_warning = false; switch (chat->type_->get_id()) { case td_api::chatTypePrivate::ID: { auto type = move_object_as(chat->type_); chat_info->type = ChatInfo::Type::Private; auto user_id = type->user_id_; chat_info->user_id = user_id; - need_warning = get_user_info(user_id) == nullptr; break; } case td_api::chatTypeBasicGroup::ID: { @@ -5175,7 +5173,6 @@ void Client::on_update(object_ptr result) { chat_info->type = ChatInfo::Type::Group; auto group_id = type->basic_group_id_; chat_info->group_id = group_id; - need_warning = get_group_info(group_id) == nullptr; break; } case td_api::chatTypeSupergroup::ID: { @@ -5183,7 +5180,6 @@ void Client::on_update(object_ptr result) { chat_info->type = ChatInfo::Type::Supergroup; auto supergroup_id = type->supergroup_id_; chat_info->supergroup_id = supergroup_id; - need_warning = get_supergroup_info(supergroup_id) == nullptr; break; } case td_api::chatTypeSecret::ID: @@ -5192,9 +5188,6 @@ void Client::on_update(object_ptr result) { default: UNREACHABLE(); } - if (need_warning) { - LOG(ERROR) << "Received updateNewChat about chat " << chat->id_ << ", but hadn't received corresponding info"; - } chat_info->title = std::move(chat->title_); chat_info->photo_info = std::move(chat->photo_); @@ -10457,8 +10450,8 @@ void Client::set_group_photo(int64 group_id, object_ptr &&pho add_group_info(group_id)->photo = std::move(photo); } -void Client::set_group_description(int64 group_id, td::string &&descripton) { - add_group_info(group_id)->description = std::move(descripton); +void Client::set_group_description(int64 group_id, td::string &&description) { + add_group_info(group_id)->description = std::move(description); } void Client::set_group_invite_link(int64 group_id, td::string &&invite_link) { @@ -10486,8 +10479,8 @@ void Client::set_supergroup_photo(int64 supergroup_id, object_ptrphoto = std::move(photo); } -void Client::set_supergroup_description(int64 supergroup_id, td::string &&descripton) { - add_supergroup_info(supergroup_id)->description = std::move(descripton); +void Client::set_supergroup_description(int64 supergroup_id, td::string &&description) { + add_supergroup_info(supergroup_id)->description = std::move(description); } void Client::set_supergroup_invite_link(int64 supergroup_id, td::string &&invite_link) { diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h index 6d9795a..7762aac 100644 --- a/telegram-bot-api/Client.h +++ b/telegram-bot-api/Client.h @@ -746,7 +746,7 @@ class Client final : public WebhookActor::Callback { }; static void add_group(GroupInfo *group_info, object_ptr &&group); void set_group_photo(int64 group_id, object_ptr &&photo); - void set_group_description(int64 group_id, td::string &&descripton); + void set_group_description(int64 group_id, td::string &&description); void set_group_invite_link(int64 group_id, td::string &&invite_link); GroupInfo *add_group_info(int64 group_id); const GroupInfo *get_group_info(int64 group_id) const; @@ -774,7 +774,7 @@ class Client final : public WebhookActor::Callback { }; static void add_supergroup(SupergroupInfo *supergroup_info, object_ptr &&supergroup); void set_supergroup_photo(int64 supergroup_id, object_ptr &&photo); - void set_supergroup_description(int64 supergroup_id, td::string &&descripton); + void set_supergroup_description(int64 supergroup_id, td::string &&description); void set_supergroup_invite_link(int64 supergroup_id, td::string &&invite_link); void set_supergroup_sticker_set_id(int64 supergroup_id, int64 sticker_set_id); void set_supergroup_can_set_sticker_set(int64 supergroup_id, bool can_set_sticker_set); diff --git a/telegram-bot-api/Stats.h b/telegram-bot-api/Stats.h index 119f72f..3871053 100644 --- a/telegram-bot-api/Stats.h +++ b/telegram-bot-api/Stats.h @@ -147,7 +147,7 @@ class BotStatActor final : public td::Actor { } BotStatActor(const BotStatActor &) = delete; - BotStatActor &operator=(const BotStatActor &other) = delete; + BotStatActor &operator=(const BotStatActor &) = delete; BotStatActor(BotStatActor &&) = default; BotStatActor &operator=(BotStatActor &&other) noexcept { if (!empty()) {