tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use request promise in getInlineQueryResults.

Browse Source
This commit is contained in:
levlam 2024-07-17 17:19:01 +03:00
parent 9281efa3f0
commit 7e8304e6d4
3 changed files with 34 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
td/telegram/InlineQueriesManager.cpp
View File

@ -60,7 +60,7 @@
namespace td {
class GetInlineBotResultsQuery final : public Td::ResultHandler {
Promise<Unit> promise_;
Promise<td_api::object_ptr<td_api::inlineQueryResults>> promise_;
DialogId dialog_id_;
UserId bot_user_id_;
uint64 query_hash_;
@ -68,7 +68,8 @@ class GetInlineBotResultsQuery final : public Td::ResultHandler {
static constexpr int32 GET_INLINE_BOT_RESULTS_FLAG_HAS_LOCATION = 1 << 0;
public:
explicit GetInlineBotResultsQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
explicit GetInlineBotResultsQuery(Promise<td_api::object_ptr<td_api::inlineQueryResults>> &&promise)
: promise_(std::move(promise)) {
}
NetQueryRef send(UserId bot_user_id, DialogId dialog_id, tl_object_ptr<telegram_api::InputUser> bot_input_user,
@ -99,8 +100,7 @@ class GetInlineBotResultsQuery final : public Td::ResultHandler {
}
td_->inline_queries_manager_->on_get_inline_query_results(dialog_id_, bot_user_id_, query_hash_,
result_ptr.move_as_ok());
promise_.set_value(Unit());
result_ptr.move_as_ok(), std::move(promise_));
}
void on_error(Status status) final {
@ -111,7 +111,7 @@ class GetInlineBotResultsQuery final : public Td::ResultHandler {
}
LOG(INFO) << "Receive error for GetInlineBotResultsQuery: " << status;
td_->inline_queries_manager_->on_get_inline_query_results(dialog_id_, bot_user_id_, query_hash_, nullptr);
td_->inline_queries_manager_->on_get_inline_query_results(dialog_id_, bot_user_id_, query_hash_, nullptr, Auto());
promise_.set_error(std::move(status));
}
};
@ -985,21 +985,19 @@ Result<tl_object_ptr<telegram_api::InputBotInlineResult>> InlineQueriesManager::
flags, id, type, title, description, url, std::move(thumbnail), std::move(content), std::move(inline_message));
}
uint64 InlineQueriesManager::send_inline_query(UserId bot_user_id, DialogId dialog_id, Location user_location,
const string &query, const string &offset, Promise<Unit> &&promise) {
void InlineQueriesManager::send_inline_query(UserId bot_user_id, DialogId dialog_id, Location user_location,
const string &query, const string &offset,
Promise<td_api::object_ptr<td_api::inlineQueryResults>> &&promise) {
if (td_->auth_manager_->is_bot()) {
promise.set_error(Status::Error(400, "Bot can't send inline queries to other bot"));
return 0;
return promise.set_error(Status::Error(400, "Bot can't send inline queries to other bot"));
}
auto r_bot_data = td_->user_manager_->get_bot_data(bot_user_id);
if (r_bot_data.is_error()) {
promise.set_error(r_bot_data.move_as_error());
return 0;
return promise.set_error(r_bot_data.move_as_error());
}
if (!r_bot_data.ok().is_inline) {
promise.set_error(Status::Error(400, "Bot doesn't support inline queries"));
return 0;
return promise.set_error(Status::Error(400, "Bot doesn't support inline queries"));
}
auto input_peer = td_->dialog_manager_->get_input_peer(dialog_id, AccessRights::Read);
@ -1044,8 +1042,7 @@ uint64 InlineQueriesManager::send_inline_query(UserId bot_user_id, DialogId dial
if (it != inline_query_results_.end()) {
it->second.pending_request_count++;
if (Time::now() < it->second.cache_expire_time) {
promise.set_value(Unit());
return query_hash;
return promise.set_value(get_inline_query_results_object(query_hash));
}
} else {
inline_query_results_[query_hash] = {nullptr, -1.0, 1};
@ -1054,7 +1051,7 @@ uint64 InlineQueriesManager::send_inline_query(UserId bot_user_id, DialogId dial
if (pending_inline_query_ != nullptr) {
LOG(INFO) << "Drop inline query " << pending_inline_query_->query_hash;
on_get_inline_query_results(pending_inline_query_->dialog_id, pending_inline_query_->bot_user_id,
pending_inline_query_->query_hash, nullptr);
pending_inline_query_->query_hash, nullptr, Auto());
pending_inline_query_->promise.set_error(Status::Error(406, "Request canceled"));
}
@ -1062,8 +1059,6 @@ uint64 InlineQueriesManager::send_inline_query(UserId bot_user_id, DialogId dial
query_hash, bot_user_id, dialog_id, std::move(input_peer), user_location, query, offset, std::move(promise)});
loop();
return query_hash;
}
void InlineQueriesManager::loop() {
@ -1457,12 +1452,13 @@ static tl_object_ptr<td_api::InlineQueryResult> copy_result(const tl_object_ptr<
}
template <>
tl_object_ptr<td_api::inlineQueryResults> copy(const td_api::inlineQueryResults &obj) {
td_api::object_ptr<td_api::inlineQueryResults> copy(const td_api::inlineQueryResults &obj) {
return td_api::make_object<td_api::inlineQueryResults>(obj.inline_query_id_, copy(obj.button_),
transform(obj.results_, copy_result), obj.next_offset_);
}
tl_object_ptr<td_api::inlineQueryResults> InlineQueriesManager::decrease_pending_request_count(uint64 query_hash) {
td_api::object_ptr<td_api::inlineQueryResults> InlineQueriesManager::get_inline_query_results_object(
uint64 query_hash) {
auto it = inline_query_results_.find(query_hash);
CHECK(it != inline_query_results_.end());
CHECK(it->second.pending_request_count > 0);
@ -1543,12 +1539,14 @@ string InlineQueriesManager::get_web_document_content_type(
return {};
}
void InlineQueriesManager::on_get_inline_query_results(DialogId dialog_id, UserId bot_user_id, uint64 query_hash,
tl_object_ptr<telegram_api::messages_botResults> &&results) {
void InlineQueriesManager::on_get_inline_query_results(
DialogId dialog_id, UserId bot_user_id, uint64 query_hash,
tl_object_ptr<telegram_api::messages_botResults> &&results,
Promise<td_api::object_ptr<td_api::inlineQueryResults>> promise) {
LOG(INFO) << "Receive results for inline query " << query_hash;
if (results == nullptr || results->query_id_ == 0) {
decrease_pending_request_count(query_hash);
return;
get_inline_query_results_object(query_hash);
return promise.set_error(Status::Error(500, "Receive no response"));
}
LOG(INFO) << to_string(results);
@ -2007,6 +2005,7 @@ void InlineQueriesManager::on_get_inline_query_results(DialogId dialog_id, UserI
it->second.results = make_tl_object<td_api::inlineQueryResults>(results->query_id_, std::move(button),
std::move(output_results), results->next_offset_);
it->second.cache_expire_time = Time::now() + results->cache_time_;
promise.set_value(get_inline_query_results_object(query_hash));
}
vector<UserId> InlineQueriesManager::get_recent_inline_bots(Promise<Unit> &&promise) {
@ -2099,10 +2098,6 @@ bool InlineQueriesManager::load_recently_used_bots(Promise<Unit> &promise) {
return false;
}
tl_object_ptr<td_api::inlineQueryResults> InlineQueriesManager::get_inline_query_results_object(uint64 query_hash) {
return decrease_pending_request_count(query_hash);
}
void InlineQueriesManager::on_new_query(int64 query_id, UserId sender_user_id, Location user_location,
tl_object_ptr<telegram_api::InlineQueryPeerType> peer_type, const string &query,
const string &offset) {

15
td/telegram/InlineQueriesManager.h
View File

@ -55,8 +55,8 @@ class InlineQueriesManager final : public Actor {
td_api::object_ptr<td_api::InputInlineQueryResult> &&input_result,
Promise<td_api::object_ptr<td_api::sentWebAppMessage>> &&promise) const;
uint64 send_inline_query(UserId bot_user_id, DialogId dialog_id, Location user_location, const string &query,
const string &offset, Promise<Unit> &&promise);
void send_inline_query(UserId bot_user_id, DialogId dialog_id, Location user_location, const string &query,
const string &offset, Promise<td_api::object_ptr<td_api::inlineQueryResults>> &&promise);
vector<UserId> get_recent_inline_bots(Promise<Unit> &&promise);
@ -67,9 +67,8 @@ class InlineQueriesManager final : public Actor {
UserId get_inline_bot_user_id(int64 query_id) const;
void on_get_inline_query_results(DialogId dialog_id, UserId bot_user_id, uint64 query_hash,
tl_object_ptr<telegram_api::messages_botResults> &&results);
tl_object_ptr<td_api::inlineQueryResults> get_inline_query_results_object(uint64 query_hash);
tl_object_ptr<telegram_api::messages_botResults> &&results,
Promise<td_api::object_ptr<td_api::inlineQueryResults>> promise);
void on_new_query(int64 query_id, UserId sender_user_id, Location user_location,
tl_object_ptr<telegram_api::InlineQueryPeerType> peer_type, const string &query,
@ -114,7 +113,7 @@ class InlineQueriesManager final : public Actor {
void save_recently_used_bots();
bool load_recently_used_bots(Promise<Unit> &promise);
tl_object_ptr<td_api::inlineQueryResults> decrease_pending_request_count(uint64 query_hash);
td_api::object_ptr<td_api::inlineQueryResults> get_inline_query_results_object(uint64 query_hash);
static void on_drop_inline_query_result_timeout_callback(void *inline_queries_manager_ptr, int64 query_hash);
@ -135,7 +134,7 @@ class InlineQueriesManager final : public Actor {
Location user_location;
string query;
string offset;
Promise<Unit> promise;
Promise<td_api::object_ptr<td_api::inlineQueryResults>> promise;
};
double next_inline_query_time_ = 0.0;
@ -143,7 +142,7 @@ class InlineQueriesManager final : public Actor {
NetQueryRef sent_query_;
struct InlineQueryResult {
tl_object_ptr<td_api::inlineQueryResults> results;
td_api::object_ptr<td_api::inlineQueryResults> results;
double cache_expire_time;
int32 pending_request_count;
};

37
td/telegram/Td.cpp
View File

@ -2332,37 +2332,6 @@ class RemoveSavedNotificationSoundRequest final : public RequestOnceActor {
}
};
class GetInlineQueryResultsRequest final : public RequestOnceActor {
UserId bot_user_id_;
DialogId dialog_id_;
Location user_location_;
string query_;
string offset_;
uint64 query_hash_;
void do_run(Promise<Unit> &&promise) final {
query_hash_ = td_->inline_queries_manager_->send_inline_query(bot_user_id_, dialog_id_, user_location_, query_,
offset_, std::move(promise));
}
void do_send_result() final {
send_result(td_->inline_queries_manager_->get_inline_query_results_object(query_hash_));
}
public:
GetInlineQueryResultsRequest(ActorShared<Td> td, uint64 request_id, int64 bot_user_id, int64 dialog_id,
const tl_object_ptr<td_api::location> &user_location, string query, string offset)
: RequestOnceActor(std::move(td), request_id)
, bot_user_id_(bot_user_id)
, dialog_id_(dialog_id)
, user_location_(user_location)
, query_(std::move(query))
, offset_(std::move(offset))
, query_hash_(0) {
}
};
class SearchBackgroundRequest final : public RequestActor<> {
string name_;
@ -9005,8 +8974,10 @@ void Td::on_request(uint64 id, td_api::getInlineQueryResults &request) {
CHECK_IS_USER();
CLEAN_INPUT_STRING(request.query_);
CLEAN_INPUT_STRING(request.offset_);
CREATE_REQUEST(GetInlineQueryResultsRequest, request.bot_user_id_, request.chat_id_, request.user_location_,
std::move(request.query_), std::move(request.offset_));
CREATE_REQUEST_PROMISE();
inline_queries_manager_->send_inline_query(UserId(request.bot_user_id_), DialogId(request.chat_id_),
Location(request.user_location_), request.query_, request.offset_,
std::move(promise));
}
void Td::on_request(uint64 id, td_api::answerInlineQuery &request) {