tdlight-team/tdlight-telegram-bot-api
tdlight-team/tdlight-telegram-bot-api
1
1
Fork 0
mirror of https://github.com/tdlight-team/tdlight-telegram-bot-api.git synced 2025-01-14 05:47:32 +01:00
Code Issues Projects Releases Wiki Activity

Add Client::get_legacy_input_sticker.

Browse Source
This commit is contained in:
levlam 2024-03-18 12:52:17 +03:00
parent c783b1c821
commit 5bc5297746
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
telegram-bot-api/Client.cpp
View File

@ -8138,8 +8138,11 @@ td::Result<td_api::object_ptr<td_api::inputSticker>> Client::get_input_sticker(c
return r_sticker.move_as_ok(); return r_sticker.move_as_ok();
} }
auto emojis = query->arg("emojis"); return get_legacy_input_sticker(query);
}
td::Result<td_api::object_ptr<td_api::inputSticker>> Client::get_legacy_input_sticker(const Query *query) const {
auto emojis = query->arg("emojis");
auto sticker = get_input_file(query, "png_sticker"); auto sticker = get_input_file(query, "png_sticker");
object_ptr<td_api::StickerFormat> sticker_format; object_ptr<td_api::StickerFormat> sticker_format;
object_ptr<td_api::maskPosition> mask_position; object_ptr<td_api::maskPosition> mask_position;
@ -8202,37 +8205,10 @@ td::Result<td::vector<td_api::object_ptr<td_api::inputSticker>>> Client::get_inp
return std::move(input_stickers); return std::move(input_stickers);
} }
auto emojis = query->arg("emojis"); TRY_RESULT(input_sticker, get_legacy_input_sticker(query));
auto sticker = get_input_file(query, "png_sticker");
object_ptr<td_api::StickerFormat> sticker_format;
object_ptr<td_api::maskPosition> mask_position;
if (sticker != nullptr) {
sticker_format = make_object<td_api::stickerFormatWebp>();
TRY_RESULT_ASSIGN(mask_position, get_mask_position(query, "mask_position"));
} else {
sticker = get_input_file(query, "tgs_sticker", true);
if (sticker != nullptr) {
sticker_format = make_object<td_api::stickerFormatTgs>();
} else {
sticker = get_input_file(query, "webm_sticker", true);
if (sticker != nullptr) {
sticker_format = make_object<td_api::stickerFormatWebm>();
} else {
if (!query->arg("tgs_sticker").empty()) {
return td::Status::Error(400, "Bad Request: animated sticker must be uploaded as an InputFile");
}
if (!query->arg("webm_sticker").empty()) {
return td::Status::Error(400, "Bad Request: video sticker must be uploaded as an InputFile");
}
return td::Status::Error(400, "Bad Request: there is no sticker file in the request");
}
}
}
td::vector<object_ptr<td_api::inputSticker>> stickers; td::vector<object_ptr<td_api::inputSticker>> stickers;
stickers.push_back(make_object<td_api::inputSticker>(std::move(sticker), std::move(sticker_format), emojis.str(), stickers.push_back(std::move(input_sticker));
std::move(mask_position), td::vector<td::string>()));
return std::move(stickers); return std::move(stickers);
} }

2
telegram-bot-api/Client.h
View File

@ -486,6 +486,8 @@ class Client final : public WebhookActor::Callback {
static td::Result<object_ptr<td_api::StickerFormat>> get_sticker_format(td::Slice sticker_format); static td::Result<object_ptr<td_api::StickerFormat>> get_sticker_format(td::Slice sticker_format);
td::Result<object_ptr<td_api::inputSticker>> get_legacy_input_sticker(const Query *query) const;
td::Result<object_ptr<td_api::inputSticker>> get_input_sticker(const Query *query) const; td::Result<object_ptr<td_api::inputSticker>> get_input_sticker(const Query *query) const;
td::Result<object_ptr<td_api::inputSticker>> get_input_sticker(const Query *query, td::JsonValue &&value, td::Result<object_ptr<td_api::inputSticker>> get_input_sticker(const Query *query, td::JsonValue &&value,