Skip to content

Commit bd31c2a

Browse files
committed
Support stopPoll for business messages.
1 parent 86fb9bc commit bd31c2a

File tree

2 files changed

+50
-3
lines changed

2 files changed

+50
-3
lines changed

telegram-bot-api/Client.cpp

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4359,6 +4359,34 @@ class Client::TdOnStopPollCallback final : public TdQueryCallback {
43594359
PromisedQueryPtr query_;
43604360
};
43614361

4362+
class Client::TdOnStopBusinessPollCallback final : public TdQueryCallback {
4363+
public:
4364+
TdOnStopBusinessPollCallback(Client *client, const td::string &business_connection_id, PromisedQueryPtr query)
4365+
: client_(client), business_connection_id_(business_connection_id), query_(std::move(query)) {
4366+
}
4367+
4368+
void on_result(object_ptr<td_api::Object> result) final {
4369+
if (result->get_id() == td_api::error::ID) {
4370+
return fail_query_with_error(std::move(query_), move_object_as<td_api::error>(result));
4371+
}
4372+
4373+
CHECK(result->get_id() == td_api::businessMessage::ID);
4374+
auto message = client_->create_business_message(std::move(business_connection_id_),
4375+
move_object_as<td_api::businessMessage>(result));
4376+
if (message->content->get_id() != td_api::messagePoll::ID) {
4377+
LOG(ERROR) << "Poll not found in a business message from connection " << business_connection_id_;
4378+
return fail_query_with_error(std::move(query_), 400, "message poll not found");
4379+
}
4380+
auto message_poll = static_cast<const td_api::messagePoll *>(message->content.get());
4381+
answer_query(JsonPoll(message_poll->poll_.get(), client_), std::move(query_));
4382+
}
4383+
4384+
private:
4385+
Client *client_;
4386+
td::string business_connection_id_;
4387+
PromisedQueryPtr query_;
4388+
};
4389+
43624390
class Client::TdOnOkQueryCallback final : public TdQueryCallback {
43634391
public:
43644392
explicit TdOnOkQueryCallback(PromisedQueryPtr query) : query_(std::move(query)) {
@@ -10021,15 +10049,33 @@ td::Status Client::process_send_poll_query(PromisedQueryPtr &query) {
1002110049
}
1002210050

1002310051
td::Status Client::process_stop_poll_query(PromisedQueryPtr &query) {
10052+
auto business_connection_id = query->arg("business_connection_id");
1002410053
auto chat_id = query->arg("chat_id");
1002510054
auto message_id = get_message_id(query.get());
1002610055
TRY_RESULT(reply_markup, get_reply_markup(query.get(), bot_user_ids_));
1002710056

1002810057
resolve_reply_markup_bot_usernames(
1002910058
std::move(reply_markup), std::move(query),
10030-
[this, chat_id = chat_id.str(), message_id](object_ptr<td_api::ReplyMarkup> reply_markup,
10031-
PromisedQueryPtr query) {
10032-
check_message(chat_id, message_id, false, AccessRights::Edit, "message with poll to stop", std::move(query),
10059+
[this, business_connection_id = business_connection_id.str(), chat_id_str = chat_id.str(), message_id](
10060+
object_ptr<td_api::ReplyMarkup> reply_markup, PromisedQueryPtr query) {
10061+
if (!business_connection_id.empty()) {
10062+
auto r_chat_id = get_business_connection_chat_id(chat_id_str);
10063+
if (r_chat_id.is_error()) {
10064+
return fail_query_with_error(std::move(query), 400, r_chat_id.error().message());
10065+
}
10066+
auto chat_id = r_chat_id.move_as_ok();
10067+
return check_business_connection(
10068+
business_connection_id, std::move(query),
10069+
[this, business_connection_id, chat_id, message_id, reply_markup = std::move(reply_markup)](
10070+
const BusinessConnection *business_connection, PromisedQueryPtr query) mutable {
10071+
send_request(
10072+
make_object<td_api::stopBusinessPoll>(business_connection_id, chat_id, message_id,
10073+
std::move(reply_markup)),
10074+
td::make_unique<TdOnStopBusinessPollCallback>(this, business_connection_id, std::move(query)));
10075+
});
10076+
}
10077+
10078+
check_message(chat_id_str, message_id, false, AccessRights::Edit, "message with poll to stop", std::move(query),
1003310079
[this, reply_markup = std::move(reply_markup)](int64 chat_id, int64 message_id,
1003410080
PromisedQueryPtr query) mutable {
1003510081
send_request(

telegram-bot-api/Client.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ class Client final : public WebhookActor::Callback {
214214
class TdOnEditMessageCallback;
215215
class TdOnEditInlineMessageCallback;
216216
class TdOnStopPollCallback;
217+
class TdOnStopBusinessPollCallback;
217218
class TdOnOkQueryCallback;
218219
class TdOnGetReplyMessageCallback;
219220
class TdOnGetEditedMessageCallback;

0 commit comments

Comments
 (0)