diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 6412e0363..4ece67ac1 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -7997,7 +7997,7 @@ createNewStickerSet user_id:int53 title:string name:string sticker_format:Sticke //@user_id Sticker set owner //@name Sticker set name //@sticker Sticker to add to the set -addStickerToSet user_id:int53 name:string sticker:inputSticker = StickerSet; +addStickerToSet user_id:int53 name:string sticker:inputSticker = Ok; //@description Sets a sticker set thumbnail; for bots only. Returns the sticker set //@user_id Sticker set owner diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp index a04c10d54..61b32a9e5 100644 --- a/td/telegram/StickersManager.cpp +++ b/td/telegram/StickersManager.cpp @@ -1186,11 +1186,10 @@ class CreateNewStickerSetQuery final : public Td::ResultHandler { }; class AddStickerToSetQuery final : public Td::ResultHandler { - Promise> promise_; + Promise promise_; public: - explicit AddStickerToSetQuery(Promise> &&promise) - : promise_(std::move(promise)) { + explicit AddStickerToSetQuery(Promise &&promise) : promise_(std::move(promise)) { } void send(const string &short_name, tl_object_ptr &&input_sticker) { @@ -1211,7 +1210,7 @@ class AddStickerToSetQuery final : public Td::ResultHandler { if (!sticker_set_id.is_valid()) { return on_error(Status::Error(500, "Sticker set not found")); } - promise_.set_value(td_->stickers_manager_->get_sticker_set_object(sticker_set_id)); + promise_.set_value(Unit()); } void on_error(Status status) final { @@ -8450,8 +8449,7 @@ void StickersManager::on_new_stickers_uploaded(int64 random_id, Result res } void StickersManager::add_sticker_to_set(UserId user_id, string short_name, - tl_object_ptr &&sticker, - Promise> &&promise) { + td_api::object_ptr &&sticker, Promise &&promise) { TRY_RESULT_PROMISE(promise, input_user, td_->contacts_manager_->get_input_user(user_id)); short_name = clean_username(strip_empty_characters(short_name, MAX_STICKER_SET_SHORT_NAME_LENGTH)); @@ -8479,8 +8477,8 @@ void StickersManager::add_sticker_to_set(UserId user_id, string short_name, } void StickersManager::do_add_sticker_to_set(UserId user_id, string short_name, - tl_object_ptr &&sticker, - Promise> &&promise) { + td_api::object_ptr &&sticker, + Promise &&promise) { TRY_STATUS_PROMISE(promise, G()->close_status()); const StickerSet *sticker_set = get_sticker_set(short_name_to_sticker_set_id_.get(short_name)); diff --git a/td/telegram/StickersManager.h b/td/telegram/StickersManager.h index 2bcee389e..6a002bca0 100644 --- a/td/telegram/StickersManager.h +++ b/td/telegram/StickersManager.h @@ -305,8 +305,8 @@ class StickersManager final : public Actor { vector> &&stickers, string software, Promise> &&promise); - void add_sticker_to_set(UserId user_id, string short_name, tl_object_ptr &&sticker, - Promise> &&promise); + void add_sticker_to_set(UserId user_id, string short_name, td_api::object_ptr &&sticker, + Promise &&promise); void set_sticker_set_thumbnail(UserId user_id, string short_name, tl_object_ptr &&thumbnail, Promise> &&promise); @@ -540,7 +540,7 @@ class StickersManager final : public Actor { string short_name_; FileId file_id_; tl_object_ptr sticker_; - Promise> promise_; + Promise promise_; }; struct PendingSetStickerSetThumbnail { @@ -874,8 +874,8 @@ class StickersManager final : public Actor { void on_added_sticker_uploaded(int64 random_id, Result result); - void do_add_sticker_to_set(UserId user_id, string short_name, tl_object_ptr &&sticker, - Promise> &&promise); + void do_add_sticker_to_set(UserId user_id, string short_name, td_api::object_ptr &&sticker, + Promise &&promise); void on_sticker_set_thumbnail_uploaded(int64 random_id, Result result); diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index d9cdc8b12..13f8e4fbf 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -7295,7 +7295,7 @@ void Td::on_request(uint64 id, td_api::createNewStickerSet &request) { void Td::on_request(uint64 id, td_api::addStickerToSet &request) { CHECK_IS_BOT(); CLEAN_INPUT_STRING(request.name_); - CREATE_REQUEST_PROMISE(); + CREATE_OK_REQUEST_PROMISE(); stickers_manager_->add_sticker_to_set(UserId(request.user_id_), std::move(request.name_), std::move(request.sticker_), std::move(promise)); }