From 4925532c2577b8172e5d69ea71678c5d213a1f89 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 16 Mar 2022 12:52:34 +0300 Subject: [PATCH] Use td::unique_ptr instead of std::unique_ptr. --- telegram-bot-api/Client.cpp | 244 +++++++++++++------------- telegram-bot-api/Client.h | 16 +- telegram-bot-api/ClientManager.cpp | 8 +- telegram-bot-api/HttpConnection.cpp | 6 +- telegram-bot-api/Query.cpp | 6 +- telegram-bot-api/Query.h | 12 +- telegram-bot-api/WebhookActor.cpp | 8 +- telegram-bot-api/telegram-bot-api.cpp | 4 +- 8 files changed, 152 insertions(+), 152 deletions(-) diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index 025fce3..91bd7df 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -3180,7 +3180,7 @@ class Client::TdOnGetChatPinnedMessageCallback final : public TdQueryCallback { if (sticker_set_id != 0 && client_->get_sticker_set_name(sticker_set_id).empty()) { return client_->send_request( make_object(sticker_set_id), - std::make_unique(client_, chat_id_, pinned_message_id, std::move(query_))); + td::make_unique(client_, chat_id_, pinned_message_id, std::move(query_))); } } @@ -3217,7 +3217,7 @@ class Client::TdOnGetChatPinnedMessageToUnpinCallback final : public TdQueryCall CHECK(pinned_message_id > 0); client_->send_request(make_object(chat_id_, pinned_message_id), - std::make_unique(std::move(query_))); + td::make_unique(std::move(query_))); } private: @@ -3260,7 +3260,7 @@ class Client::TdOnGetChatFullInfoCallback final : public TdQueryCallback { // we don't need the result, everything is already received through updates client_->send_request(make_object(chat_id_), - std::make_unique(client_, chat_id_, std::move(query_))); + td::make_unique(client_, chat_id_, std::move(query_))); } private: @@ -3473,14 +3473,14 @@ void Client::close() { if (td_client_.empty()) { set_timeout_in(0); } else if (!closing_) { - do_send_request(make_object(), std::make_unique()); + do_send_request(make_object(), td::make_unique()); } } void Client::log_out(bool is_api_id_invalid) { is_api_id_invalid_ |= is_api_id_invalid; if (!td_client_.empty() && !logging_out_ && !closing_) { - do_send_request(make_object(), std::make_unique()); + do_send_request(make_object(), td::make_unique()); } } @@ -3718,7 +3718,7 @@ void Client::check_user(int64 user_id, PromisedQueryPtr query, OnSuccess on_succ return check_user_read_access(user_info, std::move(query), std::move(on_success)); } send_request(make_object(user_id), - std::make_unique>(this, std::move(query), std::move(on_success))); + td::make_unique>(this, std::move(query), std::move(on_success))); } template @@ -3729,7 +3729,7 @@ void Client::check_user_no_fail(int64 user_id, PromisedQueryPtr query, OnSuccess return; } send_request(make_object(user_id), - std::make_unique>(std::move(query), std::move(on_success))); + td::make_unique>(std::move(query), std::move(on_success))); } template @@ -3760,9 +3760,9 @@ void Client::check_chat_access(int64 chat_id, AccessRights access_rights, const CHECK(group_info != nullptr); if (!group_info->is_active && need_write_access) { if (group_info->upgraded_to_supergroup_id != 0) { - td::FlatHashMap> parameters; + td::FlatHashMap> parameters; auto updagraded_to_chat_id = get_supergroup_chat_id(group_info->upgraded_to_supergroup_id); - parameters.emplace("migrate_to_chat_id", std::make_unique(updagraded_to_chat_id)); + parameters.emplace("migrate_to_chat_id", td::make_unique(updagraded_to_chat_id)); return fail_query(400, "Bad Request: group chat was upgraded to a supergroup chat", std::move(query), std::move(parameters)); } else { @@ -3813,8 +3813,8 @@ void Client::check_chat(Slice chat_id_str, AccessRights access_rights, PromisedQ if (chat_id_str[0] == '@') { return send_request(make_object(chat_id_str.str()), - std::make_unique>(this, true, access_rights, std::move(query), - std::move(on_success))); + td::make_unique>(this, true, access_rights, std::move(query), + std::move(on_success))); } auto chat_id = td::to_integer(chat_id_str); @@ -3823,8 +3823,8 @@ void Client::check_chat(Slice chat_id_str, AccessRights access_rights, PromisedQ return check_chat_access(chat_id, access_rights, chat_info, std::move(query), std::move(on_success)); } send_request(make_object(chat_id), - std::make_unique>(this, false, access_rights, std::move(query), - std::move(on_success))); + td::make_unique>(this, false, access_rights, std::move(query), + std::move(on_success))); } template @@ -3843,7 +3843,7 @@ void Client::check_chat_no_fail(Slice chat_id_str, PromisedQueryPtr query, OnSuc if (chat_info != nullptr) { return on_success(chat_id, std::move(query)); } - send_request(make_object(chat_id), std::make_unique>( + send_request(make_object(chat_id), td::make_unique>( chat_id, std::move(query), std::move(on_success))); } @@ -3884,7 +3884,7 @@ void Client::check_remote_file_id(td::string file_id, PromisedQueryPtr query, On } send_request(make_object(std::move(file_id), nullptr), - std::make_unique>(std::move(query), std::move(on_success))); + td::make_unique>(std::move(query), std::move(on_success))); } bool Client::is_chat_member(const object_ptr &status) { @@ -3937,7 +3937,7 @@ void Client::check_message(Slice chat_id_str, int64 message_id, bool allow_empty send_request( make_object(chat_id, message_id), - std::make_unique>( + td::make_unique>( this, chat_id, message_id, allow_empty, message_type, std::move(query), std::move(on_success))); }); } @@ -3949,7 +3949,7 @@ void Client::resolve_sticker_set(const td::string &sticker_set_name, PromisedQue } send_request(make_object(sticker_set_name), - std::make_unique>(std::move(query), std::move(on_success))); + td::make_unique>(std::move(query), std::move(on_success))); } void Client::fix_reply_markup_bot_user_ids(object_ptr &reply_markup) const { @@ -4001,7 +4001,7 @@ void Client::resolve_bot_usernames(PromisedQueryPtr query, td::Promise(username), - std::make_unique(this, username)); + td::make_unique(this, username)); } } unresolved_bot_usernames_.clear(); @@ -4084,11 +4084,11 @@ void Client::get_chat_member(int64 chat_id, int64 user_id, PromisedQueryPtr quer [this, chat_id, user_id, on_success = std::move(on_success)](PromisedQueryPtr query) mutable { send_request( make_object(chat_id, td_api::make_object(user_id)), - std::make_unique>(std::move(query), std::move(on_success))); + td::make_unique>(std::move(query), std::move(on_success))); }); } -void Client::send_request(object_ptr &&f, std::unique_ptr handler) { +void Client::send_request(object_ptr &&f, td::unique_ptr handler) { if (logging_out_) { return handler->on_result( make_object(LOGGING_OUT_ERROR_CODE, get_logging_out_error_description().str())); @@ -4100,7 +4100,7 @@ void Client::send_request(object_ptr &&f, std::unique_ptr &&f, std::unique_ptr handler) { +void Client::do_send_request(object_ptr &&f, td::unique_ptr handler) { CHECK(!td_client_.empty()); auto id = handlers_.create(std::move(handler)); send_closure(td_client_, &td::ClientActor::request, id, std::move(f)); @@ -4118,7 +4118,7 @@ void Client::on_update_file(object_ptr file) { if (!parameters_->local_mode_ && file->local_->downloaded_size_ > MAX_DOWNLOAD_FILE_SIZE) { if (file->local_->is_downloading_active_) { send_request(make_object(file_id, false), - std::make_unique()); + td::make_unique()); } return on_file_download(file_id, Status::Error(400, "Bad Request: file is too big")); } @@ -4144,16 +4144,16 @@ void Client::on_update_authorization_state() { case td_api::authorizationStateWaitTdlibParameters::ID: { send_request( make_object("ignore_inline_thumbnails", make_object(true)), - std::make_unique()); + td::make_unique()); send_request(make_object("reuse_uploaded_photos_by_hash", make_object(true)), - std::make_unique()); + td::make_unique()); send_request(make_object("disable_persistent_network_statistics", make_object(true)), - std::make_unique()); + td::make_unique()); send_request(make_object("disable_time_adjustment_protection", make_object(true)), - std::make_unique()); + td::make_unique()); auto parameters = make_object(); @@ -4172,20 +4172,20 @@ void Client::on_update_authorization_state() { parameters->ignore_file_names_ = true; return send_request(make_object(std::move(parameters)), - std::make_unique(this)); + td::make_unique(this)); } case td_api::authorizationStateWaitEncryptionKey::ID: - return send_request(make_object(), std::make_unique(this)); + return send_request(make_object(), td::make_unique(this)); case td_api::authorizationStateWaitPhoneNumber::ID: send_request(make_object("online", make_object(true)), - std::make_unique()); + td::make_unique()); return send_request(make_object(bot_token_), - std::make_unique(this)); + td::make_unique(this)); case td_api::authorizationStateReady::ID: { auto user_info = get_user_info(my_id_); if (my_id_ <= 0 || user_info == nullptr) { LOG(INFO) << "Send getMe request for " << my_id_; - return send_request(make_object(), std::make_unique(this)); + return send_request(make_object(), td::make_unique(this)); } if (!was_authorized_) { @@ -4291,7 +4291,7 @@ void Client::on_update(object_ptr result) { auto message_id = update->message_id_; on_update_message_edited(chat_id, message_id, update->edit_date_, std::move(update->reply_markup_)); send_request(make_object(chat_id, message_id), - std::make_unique(this)); + td::make_unique(this)); break; } case td_api::updateDeleteMessages::ID: { @@ -4311,7 +4311,7 @@ void Client::on_update(object_ptr result) { auto generation_id = update->generation_id_; send_request( make_object(generation_id, make_object(400, "Wrong file_id")), - std::make_unique()); + td::make_unique()); break; } case td_api::updateNewChat::ID: { @@ -6442,7 +6442,7 @@ void Client::on_message_send_failed(int64 chat_id, int64 old_message_id, int64 n if (new_message_id != 0 && !logging_out_ && !closing_) { send_request(make_object(chat_id, td::vector{new_message_id}, false), - std::make_unique(this, chat_id, new_message_id)); + td::make_unique(this, chat_id, new_message_id)); } } @@ -6455,11 +6455,11 @@ void Client::on_cmd(PromisedQueryPtr query) { return query->set_retry_after_error(retry_after); } need_close_ = true; - return do_send_request(make_object(), std::make_unique(std::move(query))); + return do_send_request(make_object(), td::make_unique(std::move(query))); } if (query->method() == "logout") { clear_tqueue_ = true; - return do_send_request(make_object(), std::make_unique(std::move(query))); + return do_send_request(make_object(), td::make_unique(std::move(query))); } } @@ -6496,7 +6496,7 @@ td::Status Client::process_get_my_commands_query(PromisedQueryPtr &query) { [this](object_ptr &&scope, PromisedQueryPtr query) mutable { auto language_code = query->arg("language_code").str(); send_request(make_object(std::move(scope), language_code), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -6511,7 +6511,7 @@ td::Status Client::process_set_my_commands_query(PromisedQueryPtr &query) { PromisedQueryPtr query) mutable { auto language_code = query->arg("language_code").str(); send_request(make_object(std::move(scope), language_code, std::move(bot_commands)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -6523,7 +6523,7 @@ td::Status Client::process_delete_my_commands_query(PromisedQueryPtr &query) { [this](object_ptr &&scope, PromisedQueryPtr query) mutable { auto language_code = query->arg("language_code").str(); send_request(make_object(std::move(scope), language_code), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -6535,7 +6535,7 @@ td::Status Client::process_get_user_profile_photos_query(PromisedQueryPtr &query check_user(user_id, std::move(query), [this, user_id, offset, limit](PromisedQueryPtr query) { send_request(make_object(user_id, offset, limit), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); return Status::OK(); } @@ -6838,7 +6838,7 @@ td::Status Client::process_stop_poll_query(PromisedQueryPtr &query) { PromisedQueryPtr query) mutable { send_request( make_object(chat_id, message_id, std::move(reply_markup)), - std::make_unique(this, chat_id, message_id, std::move(query))); + td::make_unique(this, chat_id, message_id, std::move(query))); }); }); return Status::OK(); @@ -6903,7 +6903,7 @@ td::Status Client::process_send_media_group_query(PromisedQueryPtr &query) { make_object(chat_id, 0, reply_to_message_id, get_message_send_options(disable_notification, protect_content), std::move(input_message_contents), false), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }; check_message(chat_id, reply_to_message_id, reply_to_message_id <= 0 || allow_sending_without_reply, AccessRights::Write, "replied message", std::move(query), std::move(on_success)); @@ -6921,7 +6921,7 @@ td::Status Client::process_send_chat_action_query(PromisedQueryPtr &query) { check_chat(chat_id, AccessRights::Write, std::move(query), [this, action = std::move(action)](int64 chat_id, PromisedQueryPtr query) mutable { send_request(make_object(chat_id, 0, std::move(action)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -6940,7 +6940,7 @@ td::Status Client::process_edit_message_text_query(PromisedQueryPtr &query) { object_ptr reply_markup, PromisedQueryPtr query) mutable { send_request(make_object(inline_message_id, std::move(reply_markup), std::move(input_message_text)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } else { resolve_reply_markup_bot_usernames( @@ -6953,7 +6953,7 @@ td::Status Client::process_edit_message_text_query(PromisedQueryPtr &query) { int64 chat_id, int64 message_id, PromisedQueryPtr query) mutable { send_request(make_object(chat_id, message_id, std::move(reply_markup), std::move(input_message_text)), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); }); } @@ -6980,7 +6980,7 @@ td::Status Client::process_edit_message_live_location_query(PromisedQueryPtr &qu send_request( make_object(inline_message_id, std::move(reply_markup), std::move(location), heading, proximity_alert_radius), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } else { resolve_reply_markup_bot_usernames( @@ -6994,7 +6994,7 @@ td::Status Client::process_edit_message_live_location_query(PromisedQueryPtr &qu send_request(make_object( chat_id, message_id, std::move(reply_markup), std::move(location), heading, proximity_alert_radius), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); }); } @@ -7015,7 +7015,7 @@ td::Status Client::process_edit_message_media_query(PromisedQueryPtr &query) { object_ptr reply_markup, PromisedQueryPtr query) mutable { send_request(make_object(inline_message_id, std::move(reply_markup), std::move(input_message_content)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } else { resolve_reply_markup_bot_usernames( @@ -7028,7 +7028,7 @@ td::Status Client::process_edit_message_media_query(PromisedQueryPtr &query) { int64 chat_id, int64 message_id, PromisedQueryPtr query) mutable { send_request(make_object(chat_id, message_id, std::move(reply_markup), std::move(input_message_content)), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); }); } @@ -7049,7 +7049,7 @@ td::Status Client::process_edit_message_caption_query(PromisedQueryPtr &query) { object_ptr reply_markup, PromisedQueryPtr query) mutable { send_request(make_object(inline_message_id, std::move(reply_markup), std::move(caption)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } else { resolve_reply_markup_bot_usernames( @@ -7061,7 +7061,7 @@ td::Status Client::process_edit_message_caption_query(PromisedQueryPtr &query) { int64 chat_id, int64 message_id, PromisedQueryPtr query) mutable { send_request(make_object( chat_id, message_id, std::move(reply_markup), std::move(caption)), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); }); } @@ -7080,7 +7080,7 @@ td::Status Client::process_edit_message_reply_markup_query(PromisedQueryPtr &que [this, inline_message_id = inline_message_id.str()](object_ptr reply_markup, PromisedQueryPtr query) { send_request(make_object(inline_message_id, std::move(reply_markup)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } else { resolve_reply_markup_bot_usernames( @@ -7092,7 +7092,7 @@ td::Status Client::process_edit_message_reply_markup_query(PromisedQueryPtr &que PromisedQueryPtr query) mutable { send_request( make_object(chat_id, message_id, std::move(reply_markup)), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); }); } @@ -7115,7 +7115,7 @@ td::Status Client::process_delete_message_query(PromisedQueryPtr &query) { [this](int64 chat_id, int64 message_id, PromisedQueryPtr query) { delete_message(chat_id, message_id, false); send_request(make_object(chat_id, td::vector{message_id}, true), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7140,7 +7140,7 @@ td::Status Client::process_set_game_score_query(PromisedQueryPtr &query) { [this, inline_message_id = inline_message_id.str(), edit_message, user_id, score, force](PromisedQueryPtr query) { send_request(make_object(inline_message_id, edit_message, user_id, score, force), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } else { check_message(chat_id, message_id, false, AccessRights::Edit, "message to set game score", std::move(query), @@ -7150,7 +7150,7 @@ td::Status Client::process_set_game_score_query(PromisedQueryPtr &query) { [this, chat_id, message_id, user_id, score, force, edit_message](PromisedQueryPtr query) { send_request(make_object(chat_id, message_id, edit_message, user_id, score, force), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); }); } @@ -7167,7 +7167,7 @@ td::Status Client::process_get_game_high_scores_query(PromisedQueryPtr &query) { check_user_no_fail(user_id, std::move(query), [this, inline_message_id = inline_message_id.str(), user_id](PromisedQueryPtr query) { send_request(make_object(inline_message_id, user_id), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); } else { check_message(chat_id, message_id, false, AccessRights::Read, "message to get game high scores", std::move(query), @@ -7175,7 +7175,7 @@ td::Status Client::process_get_game_high_scores_query(PromisedQueryPtr &query) { check_user_no_fail( user_id, std::move(query), [this, chat_id, message_id, user_id](PromisedQueryPtr query) { send_request(make_object(chat_id, message_id, user_id), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); }); } @@ -7200,7 +7200,7 @@ td::Status Client::process_answer_inline_query_query(PromisedQueryPtr &query) { send_request( make_object(inline_query_id, is_personal, std::move(results), cache_time, next_offset, switch_pm_text, switch_pm_parameter), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7213,7 +7213,7 @@ td::Status Client::process_answer_callback_query_query(PromisedQueryPtr &query) int32 cache_time = get_integer_arg(query.get(), "cache_time", 0, 0, 24 * 30 * 60 * 60); send_request(make_object(callback_query_id, text, show_alert, url, cache_time), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); return Status::OK(); } @@ -7229,7 +7229,7 @@ td::Status Client::process_answer_shipping_query_query(PromisedQueryPtr &query) } send_request( make_object(shipping_query_id, std::move(shipping_options), error_message.str()), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); return Status::OK(); } @@ -7242,7 +7242,7 @@ td::Status Client::process_answer_pre_checkout_query_query(PromisedQueryPtr &que } send_request(make_object(pre_checkout_query_id, error_message.str()), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); return Status::OK(); } @@ -7251,7 +7251,7 @@ td::Status Client::process_export_chat_invite_link_query(PromisedQueryPtr &query check_chat(chat_id, AccessRights::Write, std::move(query), [this](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7268,7 +7268,7 @@ td::Status Client::process_create_chat_invite_link_query(PromisedQueryPtr &query PromisedQueryPtr query) { send_request(make_object(chat_id, name, expire_date, member_limit, creates_join_request), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); return Status::OK(); } @@ -7286,7 +7286,7 @@ td::Status Client::process_edit_chat_invite_link_query(PromisedQueryPtr &query) creates_join_request](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id, invite_link, name, expire_date, member_limit, creates_join_request), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); return Status::OK(); } @@ -7298,7 +7298,7 @@ td::Status Client::process_revoke_chat_invite_link_query(PromisedQueryPtr &query check_chat(chat_id, AccessRights::Write, std::move(query), [this, invite_link = invite_link.str()](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id, invite_link), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); return Status::OK(); } @@ -7312,13 +7312,13 @@ td::Status Client::process_get_chat_query(PromisedQueryPtr &query) { switch (chat_info->type) { case ChatInfo::Type::Private: return send_request(make_object(chat_info->user_id), - std::make_unique(this, chat_id, std::move(query))); + td::make_unique(this, chat_id, std::move(query))); case ChatInfo::Type::Group: return send_request(make_object(chat_info->group_id), - std::make_unique(this, chat_id, std::move(query))); + td::make_unique(this, chat_id, std::move(query))); case ChatInfo::Type::Supergroup: return send_request(make_object(chat_info->supergroup_id), - std::make_unique(this, chat_id, std::move(query))); + td::make_unique(this, chat_id, std::move(query))); case ChatInfo::Type::Unknown: default: UNREACHABLE(); @@ -7341,7 +7341,7 @@ td::Status Client::process_set_chat_photo_query(PromisedQueryPtr &query) { [this, photo = std::move(photo)](int64 chat_id, PromisedQueryPtr query) mutable { send_request(make_object( chat_id, make_object(std::move(photo))), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7351,7 +7351,7 @@ td::Status Client::process_delete_chat_photo_query(PromisedQueryPtr &query) { check_chat(chat_id, AccessRights::Write, std::move(query), [this](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id, nullptr), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7363,7 +7363,7 @@ td::Status Client::process_set_chat_title_query(PromisedQueryPtr &query) { check_chat(chat_id, AccessRights::Write, std::move(query), [this, title = title.str()](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id, title), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7377,7 +7377,7 @@ td::Status Client::process_set_chat_permissions_query(PromisedQueryPtr &query) { check_chat(chat_id, AccessRights::Write, std::move(query), [this, permissions = std::move(permissions)](int64 chat_id, PromisedQueryPtr query) mutable { send_request(make_object(chat_id, std::move(permissions)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7389,7 +7389,7 @@ td::Status Client::process_set_chat_description_query(PromisedQueryPtr &query) { check_chat(chat_id, AccessRights::Write, std::move(query), [this, description = description.str()](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id, description), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7402,7 +7402,7 @@ td::Status Client::process_pin_chat_message_query(PromisedQueryPtr &query) { check_message(chat_id, message_id, false, AccessRights::Write, "message to pin", std::move(query), [this, disable_notification](int64 chat_id, int64 message_id, PromisedQueryPtr query) { send_request(make_object(chat_id, message_id, disable_notification, false), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7414,13 +7414,13 @@ td::Status Client::process_unpin_chat_message_query(PromisedQueryPtr &query) { if (message_id == 0) { check_chat(chat_id, AccessRights::Write, std::move(query), [this](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id), - std::make_unique(this, chat_id, std::move(query))); + td::make_unique(this, chat_id, std::move(query))); }); } else { check_message(chat_id, message_id, false, AccessRights::Write, "message to unpin", std::move(query), [this](int64 chat_id, int64 message_id, PromisedQueryPtr query) { send_request(make_object(chat_id, message_id), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } return Status::OK(); @@ -7431,7 +7431,7 @@ td::Status Client::process_unpin_all_chat_messages_query(PromisedQueryPtr &query check_chat(chat_id, AccessRights::Write, std::move(query), [this](int64 chat_id, PromisedQueryPtr query) { send_request(make_object(chat_id), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7453,7 +7453,7 @@ td::Status Client::process_set_chat_sticker_set_query(PromisedQueryPtr &query) { CHECK(chat_info->type == ChatInfo::Type::Supergroup); send_request( make_object(chat_info->supergroup_id, sticker_set_id), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7471,7 +7471,7 @@ td::Status Client::process_delete_chat_sticker_set_query(PromisedQueryPtr &query CHECK(chat_info != nullptr); CHECK(chat_info->type == ChatInfo::Type::Supergroup); send_request(make_object(chat_info->supergroup_id, 0), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7502,12 +7502,12 @@ td::Status Client::process_get_chat_administrators_query(PromisedQueryPtr &query return fail_query(400, "Bad Request: there are no administrators in the private chat", std::move(query)); case ChatInfo::Type::Group: return send_request(make_object(chat_info->group_id), - std::make_unique(this, true, std::move(query))); + td::make_unique(this, true, std::move(query))); case ChatInfo::Type::Supergroup: return send_request( make_object( chat_info->supergroup_id, make_object(), 0, 100), - std::make_unique(this, get_chat_type(chat_id), std::move(query))); + td::make_unique(this, get_chat_type(chat_id), std::move(query))); case ChatInfo::Type::Unknown: default: UNREACHABLE(); @@ -7532,7 +7532,7 @@ td::Status Client::process_get_chat_member_count_query(PromisedQueryPtr &query) } case ChatInfo::Type::Supergroup: return send_request(make_object(chat_info->supergroup_id), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); case ChatInfo::Type::Unknown: default: UNREACHABLE(); @@ -7545,7 +7545,7 @@ td::Status Client::process_leave_chat_query(PromisedQueryPtr &query) { auto chat_id = query->arg("chat_id"); check_chat(chat_id, AccessRights::Read, std::move(query), [this](int64 chat_id, PromisedQueryPtr query) { - send_request(make_object(chat_id), std::make_unique(std::move(query))); + send_request(make_object(chat_id), td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7590,7 +7590,7 @@ td::Status Client::process_promote_chat_member_query(PromisedQueryPtr &query) { send_request( make_object( chat_id, td_api::make_object(user_id), std::move(status)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7623,7 +7623,7 @@ td::Status Client::process_set_chat_administrator_custom_title_query(PromisedQue send_request(make_object( chat_id, td_api::make_object(user_id), std::move(administrator)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7642,7 +7642,7 @@ td::Status Client::process_ban_chat_member_query(PromisedQueryPtr &query) { send_request(make_object( chat_id, td_api::make_object(user_id), until_date, revoke_messages), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7680,7 +7680,7 @@ td::Status Client::process_restrict_chat_member_query(PromisedQueryPtr &query) { chat_id, td_api::make_object(user_id), make_object( is_chat_member(chat_member->status_), until_date, std::move(permissions))), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7711,14 +7711,14 @@ td::Status Client::process_unban_chat_member_query(PromisedQueryPtr &query) { send_request(make_object( chat_id, td_api::make_object(user_id), make_object()), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } else { check_user_no_fail(user_id, std::move(query), [this, chat_id, user_id](PromisedQueryPtr query) { send_request(make_object( chat_id, td_api::make_object(user_id), make_object()), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); } }); @@ -7738,7 +7738,7 @@ td::Status Client::process_ban_chat_sender_chat_query(PromisedQueryPtr &query) { make_object( chat_id, td_api::make_object(sender_chat_id), until_date, false), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7755,7 +7755,7 @@ td::Status Client::process_unban_chat_sender_chat_query(PromisedQueryPtr &query) send_request(make_object( chat_id, td_api::make_object(sender_chat_id), make_object()), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7768,7 +7768,7 @@ td::Status Client::process_approve_chat_join_request_query(PromisedQueryPtr &que check_chat(chat_id, AccessRights::Write, std::move(query), [this, user_id](int64 chat_id, PromisedQueryPtr query) { check_user_no_fail(user_id, std::move(query), [this, chat_id, user_id](PromisedQueryPtr query) { send_request(make_object(chat_id, user_id, true), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7781,7 +7781,7 @@ td::Status Client::process_decline_chat_join_request_query(PromisedQueryPtr &que check_chat(chat_id, AccessRights::Write, std::move(query), [this, user_id](int64 chat_id, PromisedQueryPtr query) { check_user_no_fail(user_id, std::move(query), [this, chat_id, user_id](PromisedQueryPtr query) { send_request(make_object(chat_id, user_id, false), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); }); return Status::OK(); @@ -7791,10 +7791,10 @@ td::Status Client::process_get_sticker_set_query(PromisedQueryPtr &query) { auto name = query->arg("name"); if (td::trim(to_lower(name)) == to_lower(GREAT_MINDS_SET_NAME)) { send_request(make_object(GREAT_MINDS_SET_ID), - std::make_unique(this, true, std::move(query))); + td::make_unique(this, true, std::move(query))); } else { send_request(make_object(name.str()), - std::make_unique(this, true, std::move(query))); + td::make_unique(this, true, std::move(query))); } return Status::OK(); } @@ -7808,7 +7808,7 @@ td::Status Client::process_upload_sticker_file_query(PromisedQueryPtr &query) { send_request(make_object( user_id, make_object(std::move(png_sticker), "", make_object())), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }); return Status::OK(); } @@ -7824,7 +7824,7 @@ td::Status Client::process_create_new_sticker_set_query(PromisedQueryPtr &query) [this, user_id, title, name, stickers = std::move(stickers)](PromisedQueryPtr query) mutable { send_request(make_object(user_id, title.str(), name.str(), std::move(stickers), PSTRING() << "bot" << my_id_), - std::make_unique(this, false, std::move(query))); + td::make_unique(this, false, std::move(query))); }); return Status::OK(); } @@ -7838,7 +7838,7 @@ td::Status Client::process_add_sticker_to_set_query(PromisedQueryPtr &query) { check_user(user_id, std::move(query), [this, user_id, name, sticker = std::move(stickers[0])](PromisedQueryPtr query) mutable { send_request(make_object(user_id, name.str(), std::move(sticker)), - std::make_unique(this, false, std::move(query))); + td::make_unique(this, false, std::move(query))); }); return Status::OK(); } @@ -7850,7 +7850,7 @@ td::Status Client::process_set_sticker_set_thumb_query(PromisedQueryPtr &query) check_user(user_id, std::move(query), [this, user_id, name, thumbnail = std::move(thumbnail)](PromisedQueryPtr query) mutable { send_request(make_object(user_id, name.str(), std::move(thumbnail)), - std::make_unique(this, false, std::move(query))); + td::make_unique(this, false, std::move(query))); }); return Status::OK(); } @@ -7864,7 +7864,7 @@ td::Status Client::process_set_sticker_position_in_set_query(PromisedQueryPtr &q send_request( make_object(make_object(file_id.str()), position), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); return Status::OK(); } @@ -7875,7 +7875,7 @@ td::Status Client::process_delete_sticker_from_set_query(PromisedQueryPtr &query } send_request(make_object(make_object(file_id.str())), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); return Status::OK(); } @@ -7886,7 +7886,7 @@ td::Status Client::process_set_passport_data_errors_query(PromisedQueryPtr &quer check_user(user_id, std::move(query), [this, user_id, errors = std::move(passport_element_errors)](PromisedQueryPtr query) mutable { send_request(make_object(user_id, std::move(errors)), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); }); return Status::OK(); } @@ -7895,7 +7895,7 @@ td::Status Client::process_send_custom_request_query(PromisedQueryPtr &query) { TRY_RESULT(method, get_required_string_arg(query.get(), "method")); auto parameters = query->arg("parameters"); send_request(make_object(method.str(), parameters.str()), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); return Status::OK(); } @@ -7903,7 +7903,7 @@ td::Status Client::process_answer_custom_query_query(PromisedQueryPtr &query) { auto custom_query_id = td::to_integer(query->arg("custom_query_id")); auto data = query->arg("data"); send_request(make_object(custom_query_id, data.str()), - std::make_unique(std::move(query))); + td::make_unique(std::move(query))); return Status::OK(); } @@ -8028,7 +8028,7 @@ void Client::do_get_file(object_ptr file, PromisedQueryPtr query) } send_request(make_object(file_id, 1, 0, 0, false), - std::make_unique(this, file_id)); + td::make_unique(this, file_id)); } bool Client::is_file_being_downloaded(int32 file_id) const { @@ -8091,7 +8091,7 @@ void Client::save_webhook() const { void Client::webhook_success() { next_bot_updates_warning_time_ = td::Time::now() + BOT_UPDATES_WARNING_DELAY; if (was_bot_updates_warning_) { - send_request(make_object(0, ""), std::make_unique()); + send_request(make_object(0, ""), td::make_unique()); was_bot_updates_warning_ = false; } } @@ -8105,7 +8105,7 @@ void Client::webhook_error(Status status) { if (pending_update_count >= MIN_PENDING_UPDATES_WARNING && td::Time::now() > next_bot_updates_warning_time_) { send_request(make_object(td::narrow_cast(pending_update_count), "Webhook error. " + last_webhook_error_.message().str()), - std::make_unique()); + td::make_unique()); next_bot_updates_warning_time_ = td::Time::now_cached() + BOT_UPDATES_WARNING_DELAY; was_bot_updates_warning_ = true; } @@ -8246,7 +8246,7 @@ void Client::do_send_message(object_ptr input_messa send_request(make_object(chat_id, 0, reply_to_message_id, get_message_send_options(disable_notification, protect_content), std::move(reply_markup), std::move(input_message_content)), - std::make_unique(this, std::move(query))); + td::make_unique(this, std::move(query))); }; check_message(chat_id, reply_to_message_id, reply_to_message_id <= 0 || allow_sending_without_reply, AccessRights::Write, "replied message", std::move(query), std::move(on_success)); @@ -8414,7 +8414,7 @@ void Client::do_get_updates(int32 offset, int32 limit, int32 timeout, PromisedQu previous_get_updates_finish_time_ = td::Time::now(); next_bot_updates_warning_time_ = td::Time::now() + BOT_UPDATES_WARNING_DELAY; if (total_size == updates.size() && was_bot_updates_warning_) { - send_request(make_object(0, ""), std::make_unique()); + send_request(make_object(0, ""), td::make_unique()); was_bot_updates_warning_ = false; } answer_query(JsonUpdates(updates), std::move(query)); @@ -8426,7 +8426,7 @@ void Client::long_poll_wakeup(bool force_flag) { if (pending_update_count >= MIN_PENDING_UPDATES_WARNING && td::Time::now() > next_bot_updates_warning_time_) { send_request(make_object(td::narrow_cast(pending_update_count), "The getUpdates method is not called for too long"), - std::make_unique()); + td::make_unique()); next_bot_updates_warning_time_ = td::Time::now_cached() + BOT_UPDATES_WARNING_DELAY; // do not send warnings too often was_bot_updates_warning_ = true; @@ -8841,7 +8841,7 @@ bool Client::update_allowed_update_types(const Query *query) { value = make_object(allowed_update_types); } send_request(make_object("xallowed_update_types", std::move(value)), - std::make_unique()); + td::make_unique()); return true; } return false; @@ -8969,7 +8969,7 @@ void Client::process_new_callback_query_queue(int64 user_id, int state) { // get the message from the server queue.has_active_request_ = true; return send_request(make_object(chat_id, message_id, query->id_), - std::make_unique(this, user_id, state)); + td::make_unique(this, user_id, state)); } state = 1; } @@ -8979,7 +8979,7 @@ void Client::process_new_callback_query_queue(int64 user_id, int state) { if (reply_to_message_id > 0 && get_message(chat_id, reply_to_message_id) == nullptr) { queue.has_active_request_ = true; return send_request(make_object(chat_id, message_id), - std::make_unique(this, user_id, state)); + td::make_unique(this, user_id, state)); } state = 2; } @@ -8988,7 +8988,7 @@ void Client::process_new_callback_query_queue(int64 user_id, int state) { if (!have_sticker_set_name(message_sticker_set_id)) { queue.has_active_request_ = true; return send_request(make_object(message_sticker_set_id), - std::make_unique(this, message_sticker_set_id, user_id, 0)); + td::make_unique(this, message_sticker_set_id, user_id, 0)); } auto reply_to_message_id = message_info == nullptr || message_info->is_reply_to_message_deleted ? 0 : message_info->reply_to_message_id; @@ -8999,7 +8999,7 @@ void Client::process_new_callback_query_queue(int64 user_id, int state) { if (!have_sticker_set_name(reply_sticker_set_id)) { queue.has_active_request_ = true; return send_request(make_object(reply_sticker_set_id), - std::make_unique(this, reply_sticker_set_id, user_id, 0)); + td::make_unique(this, reply_sticker_set_id, user_id, 0)); } } } @@ -9401,13 +9401,13 @@ void Client::process_new_message_queue(int64 chat_id) { if (reply_to_message_id > 0 && get_message(chat_id, reply_to_message_id) == nullptr) { queue.has_active_request_ = true; return send_request(make_object(chat_id, message_id), - std::make_unique(this, chat_id)); + td::make_unique(this, chat_id)); } auto message_sticker_set_id = get_sticker_set_id(message_ref->content_); if (!have_sticker_set_name(message_sticker_set_id)) { queue.has_active_request_ = true; return send_request(make_object(message_sticker_set_id), - std::make_unique(this, message_sticker_set_id, 0, chat_id)); + td::make_unique(this, message_sticker_set_id, 0, chat_id)); } if (reply_to_message_id > 0) { auto reply_to_message_info = get_message(chat_id, reply_to_message_id); @@ -9416,7 +9416,7 @@ void Client::process_new_message_queue(int64 chat_id) { if (!have_sticker_set_name(reply_sticker_set_id)) { queue.has_active_request_ = true; return send_request(make_object(reply_sticker_set_id), - std::make_unique(this, reply_sticker_set_id, 0, chat_id)); + td::make_unique(this, reply_sticker_set_id, 0, chat_id)); } } @@ -9534,10 +9534,10 @@ Client::FullMessageId Client::add_message(object_ptr &&message, int64 message_id = message->id_; LOG(DEBUG) << "Add message " << message_id << " to chat " << chat_id; - std::unique_ptr message_info; + td::unique_ptr message_info; auto it = messages_.find({chat_id, message_id}); if (it == messages_.end()) { - message_info = std::make_unique(); + message_info = td::make_unique(); } else { message_info = std::move(it->second); } @@ -9643,7 +9643,7 @@ Client::FullMessageId Client::add_message(object_ptr &&message, auto sticker_set_id = get_sticker_set_id(message_info->content); if (!have_sticker_set_name(sticker_set_id)) { send_request(make_object(sticker_set_id), - std::make_unique(this, sticker_set_id, 0, 0)); + td::make_unique(this, sticker_set_id, 0, 0)); } } set_message_reply_markup(message_info.get(), std::move(message->reply_markup_)); diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h index 0e8c116..639299e 100644 --- a/telegram-bot-api/Client.h +++ b/telegram-bot-api/Client.h @@ -279,8 +279,8 @@ class Client final : public WebhookActor::Callback { template void get_chat_member(int64 chat_id, int64 user_id, PromisedQueryPtr query, OnSuccess on_success); - void send_request(object_ptr &&f, std::unique_ptr handler); - void do_send_request(object_ptr &&f, std::unique_ptr handler); + void send_request(object_ptr &&f, td::unique_ptr handler); + void do_send_request(object_ptr &&f, td::unique_ptr handler); static object_ptr execute(object_ptr &&f); void on_update(object_ptr result); void on_result(td::uint64 id, object_ptr result); @@ -865,11 +865,11 @@ class Client final : public WebhookActor::Callback { static td::FlatHashMap methods_; - td::FlatHashMap, FullMessageIdHash> messages_; // message cache - td::FlatHashMap> users_; // user info cache - td::FlatHashMap> groups_; // group info cache - td::FlatHashMap> supergroups_; // supergroup info cache - td::FlatHashMap> chats_; // chat info cache + td::FlatHashMap, FullMessageIdHash> messages_; // message cache + td::FlatHashMap> users_; // user info cache + td::FlatHashMap> groups_; // group info cache + td::FlatHashMap> supergroups_; // supergroup info cache + td::FlatHashMap> chats_; // chat info cache td::FlatHashMap, FullMessageIdHash> reply_message_ids_; // message -> replies to it @@ -940,7 +940,7 @@ class Client final : public WebhookActor::Callback { td::ActorContext context_; std::queue cmd_queue_; td::vector> pending_updates_; - td::Container> handlers_; + td::Container> handlers_; static constexpr int32 LONG_POLL_MAX_TIMEOUT = 50; static constexpr double LONG_POLL_MAX_DELAY = 0.01; diff --git a/telegram-bot-api/ClientManager.cpp b/telegram-bot-api/ClientManager.cpp index 0630f21..740f92d 100644 --- a/telegram-bot-api/ClientManager.cpp +++ b/telegram-bot-api/ClientManager.cpp @@ -85,7 +85,7 @@ void ClientManager::send(PromisedQueryPtr query) { auto id_it = token_to_id_.find(token); if (id_it == token_to_id_.end()) { - std::string ip_address; + td::string ip_address; if (query->peer_address().is_valid() && !query->peer_address().is_reserved()) { // external connection ip_address = query->peer_address().get_ip_str().str(); } else { @@ -386,9 +386,9 @@ PromisedQueryPtr ClientManager::get_webhook_restore_query(td::Slice token, td::S args.emplace_back(add_string("url"), add_string(parser.read_all())); const auto method = add_string("setwebhook"); - auto query = std::make_unique(std::move(containers), token, is_test_dc, method, std::move(args), - td::vector>(), - td::vector(), std::move(shared_data), td::IPAddress(), true); + auto query = td::make_unique(std::move(containers), token, is_test_dc, method, std::move(args), + td::vector>(), + td::vector(), std::move(shared_data), td::IPAddress(), true); return PromisedQueryPtr(query.release(), PromiseDeleter(td::PromiseActor>())); } diff --git a/telegram-bot-api/HttpConnection.cpp b/telegram-bot-api/HttpConnection.cpp index 2875e75..68dcdec 100644 --- a/telegram-bot-api/HttpConnection.cpp +++ b/telegram-bot-api/HttpConnection.cpp @@ -44,9 +44,9 @@ void HttpConnection::handle(td::unique_ptr http_query, } auto method = url_path_parser.data(); - auto query = std::make_unique(std::move(http_query->container_), token, is_test_dc, method, - std::move(http_query->args_), std::move(http_query->headers_), - std::move(http_query->files_), shared_data_, http_query->peer_address_, false); + auto query = td::make_unique(std::move(http_query->container_), token, is_test_dc, method, + std::move(http_query->args_), std::move(http_query->headers_), + std::move(http_query->files_), shared_data_, http_query->peer_address_, false); td::PromiseActor> promise; td::FutureActor> future; diff --git a/telegram-bot-api/Query.cpp b/telegram-bot-api/Query.cpp index d8fb3b9..e2a7b08 100644 --- a/telegram-bot-api/Query.cpp +++ b/telegram-bot-api/Query.cpp @@ -21,7 +21,7 @@ namespace telegram_bot_api { -td::FlatHashMap> empty_parameters; +td::FlatHashMap> empty_parameters; Query::Query(td::vector &&container, td::Slice token, bool is_test_dc, td::MutableSlice method, td::vector> &&args, @@ -96,8 +96,8 @@ void Query::set_error(int http_status_code, td::BufferSlice result) { void Query::set_retry_after_error(int retry_after) { retry_after_ = retry_after; - td::FlatHashMap> parameters; - parameters.emplace("retry_after", std::make_unique(retry_after)); + td::FlatHashMap> parameters; + parameters.emplace("retry_after", td::make_unique(retry_after)); set_error(429, td::json_encode( JsonQueryError(429, PSLICE() << "Too Many Requests: retry after " << retry_after, parameters))); } diff --git a/telegram-bot-api/Query.h b/telegram-bot-api/Query.h index ed40911..96bd056 100644 --- a/telegram-bot-api/Query.h +++ b/telegram-bot-api/Query.h @@ -164,11 +164,11 @@ td::StringBuilder &operator<<(td::StringBuilder &sb, const Query &query); // fix for outdated C++14 libraries // https://stackoverflow.com/questions/26947704/implicit-conversion-failure-from-initializer-list -extern td::FlatHashMap> empty_parameters; +extern td::FlatHashMap> empty_parameters; class JsonParameters final : public td::Jsonable { public: - explicit JsonParameters(const td::FlatHashMap> ¶meters) + explicit JsonParameters(const td::FlatHashMap> ¶meters) : parameters_(parameters) { } void store(td::JsonValueScope *scope) const { @@ -180,7 +180,7 @@ class JsonParameters final : public td::Jsonable { } private: - const td::FlatHashMap> ¶meters_; + const td::FlatHashMap> ¶meters_; }; template @@ -206,7 +206,7 @@ class JsonQueryError final : public td::Jsonable { public: JsonQueryError( int error_code, td::Slice description, - const td::FlatHashMap> ¶meters = empty_parameters) + const td::FlatHashMap> ¶meters = empty_parameters) : error_code_(error_code), description_(description), parameters_(parameters) { } void store(td::JsonValueScope *scope) const { @@ -222,7 +222,7 @@ class JsonQueryError final : public td::Jsonable { private: int error_code_; td::Slice description_; - const td::FlatHashMap> ¶meters_; + const td::FlatHashMap> ¶meters_; }; class PromiseDeleter { @@ -261,7 +261,7 @@ void answer_query(const Jsonable &result, PromisedQueryPtr query, td::Slice desc inline void fail_query( int http_status_code, td::Slice description, PromisedQueryPtr query, - const td::FlatHashMap> ¶meters = empty_parameters) { + const td::FlatHashMap> ¶meters = empty_parameters) { query->set_error(http_status_code, td::json_encode(JsonQueryError(http_status_code, description, parameters))); query.reset(); // send query into promise explicitly diff --git a/telegram-bot-api/WebhookActor.cpp b/telegram-bot-api/WebhookActor.cpp index 14df122..1a42b81 100644 --- a/telegram-bot-api/WebhookActor.cpp +++ b/telegram-bot-api/WebhookActor.cpp @@ -597,10 +597,10 @@ void WebhookActor::handle(td::unique_ptr response) { if (!method.empty() && method != "deletewebhook" && method != "setwebhook" && method != "close" && method != "logout" && !td::begins_with(method, "get")) { VLOG(webhook) << "Receive request " << method << " in response to webhook"; - auto query = std::make_unique(std::move(response->container_), td::MutableSlice(), false, - td::MutableSlice(), std::move(response->args_), - std::move(response->headers_), std::move(response->files_), - parameters_->shared_data_, response->peer_address_, false); + auto query = td::make_unique(std::move(response->container_), td::MutableSlice(), false, + td::MutableSlice(), std::move(response->args_), + std::move(response->headers_), std::move(response->files_), + parameters_->shared_data_, response->peer_address_, false); auto promised_query = PromisedQueryPtr(query.release(), PromiseDeleter(td::PromiseActor>())); send_closure(callback_, &Callback::send, std::move(promised_query)); diff --git a/telegram-bot-api/telegram-bot-api.cpp b/telegram-bot-api/telegram-bot-api.cpp index 5a82db5..a87f0bd 100644 --- a/telegram-bot-api/telegram-bot-api.cpp +++ b/telegram-bot-api/telegram-bot-api.cpp @@ -230,11 +230,11 @@ int main(int argc, char *argv[]) { } return 0; }(std::getenv("TELEGRAM_API_ID")); - parameters->api_hash_ = [](auto x) -> std::string { + parameters->api_hash_ = [](auto x) -> td::string { if (x) { return x; } - return std::string(); + return td::string(); }(std::getenv("TELEGRAM_API_HASH")); options.set_usage(td::Slice(argv[0]), "--api-id= --api-hash= [--local] [OPTION]...");