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

Improve bot commands methods implementation.

This commit is contained in:
levlam 2021-06-22 04:34:29 +03:00
parent 9b85516cfd
commit 79530d6a55
4 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
td/telegram/BotCommand.cpp
View File

@ -25,11 +25,10 @@ class SetBotCommandsQuery : public Td::ResultHandler {
explicit SetBotCommandsQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
}
void send(BotCommandScope scope, const string &language_code, vector<std::pair<string, string>> &&commands) {
void send(BotCommandScope scope, const string &language_code, vector<BotCommand> &&commands) {
send_query(G()->net_query_creator().create(telegram_api::bots_setBotCommands(
scope.get_input_bot_command_scope(td), language_code, transform(commands, [](const auto &command) {
return make_tl_object<telegram_api::botCommand>(command.first, command.second);
}))));
scope.get_input_bot_command_scope(td), language_code,
transform(commands, [](const BotCommand &command) { return command.get_input_bot_command(); }))));
}
void on_result(uint64 id, BufferSlice packet) override {
@ -113,6 +112,10 @@ td_api::object_ptr<td_api::botCommand> BotCommand::get_bot_command_object() cons
return td_api::make_object<td_api::botCommand>(command_, description_);
}
telegram_api::object_ptr<telegram_api::botCommand> BotCommand::get_input_bot_command() const {
return telegram_api::make_object<telegram_api::botCommand>(command_, description_);
}
bool operator==(const BotCommand &lhs, const BotCommand &rhs) {
return lhs.command_ == rhs.command_ && lhs.description_ == rhs.description_;
}
@ -134,19 +137,25 @@ bool operator==(const BotCommands &lhs, const BotCommands &rhs) {
return lhs.bot_user_id_ == rhs.bot_user_id_ && lhs.commands_ == rhs.commands_;
}
static bool is_valid_language_code(const string &language_code) {
if (language_code.empty()) {
return true;
}
if (language_code.size() != 2) {
return false;
}
return 'a' <= language_code[0] && language_code[0] <= 'z' && 'a' <= language_code[1] && language_code[1] <= 'z';
}
void set_commands(Td *td, td_api::object_ptr<td_api::BotCommandScope> &&scope_ptr, string &&language_code,
vector<td_api::object_ptr<td_api::botCommand>> &&commands, Promise<Unit> &&promise) {
TRY_RESULT_PROMISE(promise, scope, BotCommandScope::get_bot_command_scope(td, std::move(scope_ptr)));
if (!language_code.empty() && (language_code.size() != 2 || language_code[0] < 'a' || language_code[0] > 'z' ||
language_code[1] < 'a' || language_code[1] > 'z')) {
if (!is_valid_language_code(language_code)) {
return promise.set_error(Status::Error(400, "Invalid language code specified"));
}
if (!scope.have_input_bot_command_scope(td)) {
return promise.set_error(Status::Error(400, "Invalid scope specified"));
}
vector<std::pair<string, string>> new_commands;
vector<BotCommand> new_commands;
for (auto &command : commands) {
if (command == nullptr) {
return promise.set_error(Status::Error(400, "Command must be non-empty"));
@ -194,13 +203,9 @@ void delete_commands(Td *td, td_api::object_ptr<td_api::BotCommandScope> &&scope
Promise<Unit> &&promise) {
TRY_RESULT_PROMISE(promise, scope, BotCommandScope::get_bot_command_scope(td, std::move(scope_ptr)));
if (!language_code.empty() && (language_code.size() != 2 || language_code[0] < 'a' || language_code[0] > 'z' ||
language_code[1] < 'a' || language_code[1] > 'z')) {
if (!is_valid_language_code(language_code)) {
return promise.set_error(Status::Error(400, "Invalid language code specified"));
}
if (!scope.have_input_bot_command_scope(td)) {
return promise.set_error(Status::Error(400, "Invalid scope specified"));
}
td->create_handler<ResetBotCommandsQuery>(std::move(promise))->send(scope, language_code);
}
@ -209,13 +214,9 @@ void get_commands(Td *td, td_api::object_ptr<td_api::BotCommandScope> &&scope_pt
Promise<td_api::object_ptr<td_api::botCommands>> &&promise) {
TRY_RESULT_PROMISE(promise, scope, BotCommandScope::get_bot_command_scope(td, std::move(scope_ptr)));
if (!language_code.empty() && (language_code.size() != 2 || language_code[0] < 'a' || language_code[0] > 'z' ||
language_code[1] < 'a' || language_code[1] > 'z')) {
if (!is_valid_language_code(language_code)) {
return promise.set_error(Status::Error(400, "Invalid language code specified"));
}
if (!scope.have_input_bot_command_scope(td)) {
return promise.set_error(Status::Error(400, "Invalid scope specified"));
}
td->create_handler<GetBotCommandsQuery>(std::move(promise))->send(scope, language_code);
}

4
td/telegram/BotCommand.h
View File

@ -29,10 +29,12 @@ class BotCommand {
BotCommand() = default;
BotCommand(string command, string description) : command_(std::move(command)), description_(std::move(description)) {
}
BotCommand(telegram_api::object_ptr<telegram_api::botCommand> &&bot_command);
explicit BotCommand(telegram_api::object_ptr<telegram_api::botCommand> &&bot_command);
td_api::object_ptr<td_api::botCommand> get_bot_command_object() const;
telegram_api::object_ptr<telegram_api::botCommand> get_input_bot_command() const;
template <class StorerT>
void store(StorerT &storer) const {
td::store(command_, storer);

13
td/telegram/BotCommandScope.cpp
View File

@ -56,6 +56,9 @@ Result<BotCommandScope> BotCommandScope::get_bot_command_scope(Td *td,
if (!user_id.is_valid()) {
return Status::Error(400, "User not found");
}
if (!td->contacts_manager_->have_input_user(user_id)) {
return Status::Error(400, "Can't access the user");
}
break;
}
default:
@ -92,16 +95,6 @@ Result<BotCommandScope> BotCommandScope::get_bot_command_scope(Td *td,
return BotCommandScope(type, dialog_id, user_id);
}
bool BotCommandScope::have_input_bot_command_scope(const Td *td) const {
if (dialog_id_.is_valid() && !td->messages_manager_->have_input_peer(dialog_id_, AccessRights::Read)) {
return false;
}
if (user_id_.is_valid() && !td->contacts_manager_->have_input_user(user_id_)) {
return false;
}
return true;
}
telegram_api::object_ptr<telegram_api::BotCommandScope> BotCommandScope::get_input_bot_command_scope(
const Td *td) const {
auto input_peer =

2
td/telegram/BotCommandScope.h
View File

@ -37,8 +37,6 @@ class BotCommandScope {
public:
static Result<BotCommandScope> get_bot_command_scope(Td *td, td_api::object_ptr<td_api::BotCommandScope> scope_ptr);
bool have_input_bot_command_scope(const Td *td) const;
telegram_api::object_ptr<telegram_api::BotCommandScope> get_input_bot_command_scope(const Td *td) const;
};