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

Use error code 400 in Td.cpp.

Browse Source
This commit is contained in:
levlam 2021-09-29 19:19:24 +03:00
parent 39968780ba
commit 665ae9434e
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
td/telegram/Td.cpp
View File

@ -6445,15 +6445,15 @@ void Td::on_request(uint64 id, const td_api::clearAllDraftMessages &request) {
void Td::on_request(uint64 id, const td_api::downloadFile &request) { void Td::on_request(uint64 id, const td_api::downloadFile &request) {
auto priority = request.priority_; auto priority = request.priority_;
if (!(1 <= priority && priority <= 32)) { if (!(1 <= priority && priority <= 32)) {
return send_error_raw(id, 5, "Download priority must be in [1;32] range"); return send_error_raw(id, 400, "Download priority must be in [1;32] range");
} }
auto offset = request.offset_; auto offset = request.offset_;
if (offset < 0) { if (offset < 0) {
return send_error_raw(id, 5, "Download offset must be non-negative"); return send_error_raw(id, 400, "Download offset must be non-negative");
} }
auto limit = request.limit_; auto limit = request.limit_;
if (limit < 0) { if (limit < 0) {
return send_error_raw(id, 5, "Download limit must be non-negative"); return send_error_raw(id, 400, "Download limit must be non-negative");
} }
FileId file_id(request.file_id_, 0); FileId file_id(request.file_id_, 0);
@ -6516,7 +6516,7 @@ void Td::on_file_download_finished(FileId file_id) {
void Td::on_request(uint64 id, const td_api::getFileDownloadedPrefixSize &request) { void Td::on_request(uint64 id, const td_api::getFileDownloadedPrefixSize &request) {
if (request.offset_ < 0) { if (request.offset_ < 0) {
return send_error_raw(id, 5, "Parameter offset must be non-negative"); return send_error_raw(id, 400, "Parameter offset must be non-negative");
} }
auto file_view = file_manager_->get_file_view(FileId(request.file_id_, 0)); auto file_view = file_manager_->get_file_view(FileId(request.file_id_, 0));
if (file_view.empty()) { if (file_view.empty()) {
@ -6543,7 +6543,7 @@ void Td::on_request(uint64 id, const td_api::getSuggestedFileName &request) {
void Td::on_request(uint64 id, td_api::uploadFile &request) { void Td::on_request(uint64 id, td_api::uploadFile &request) {
auto priority = request.priority_; auto priority = request.priority_;
if (!(1 <= priority && priority <= 32)) { if (!(1 <= priority && priority <= 32)) {
return send_error_raw(id, 5, "Upload priority must be in [1;32] range"); return send_error_raw(id, 400, "Upload priority must be in [1;32] range");
} }
auto file_type = request.file_type_ == nullptr ? FileType::Temp : get_file_type(*request.file_type_); auto file_type = request.file_type_ == nullptr ? FileType::Temp : get_file_type(*request.file_type_);
@ -6646,7 +6646,7 @@ void Td::on_request(uint64 id, const td_api::getBlockedMessageSenders &request)
void Td::on_request(uint64 id, td_api::addContact &request) { void Td::on_request(uint64 id, td_api::addContact &request) {
CHECK_IS_USER(); CHECK_IS_USER();
if (request.contact_ == nullptr) { if (request.contact_ == nullptr) {
return send_error_raw(id, 5, "Contact must be non-empty"); return send_error_raw(id, 400, "Contact must be non-empty");
} }
CLEAN_INPUT_STRING(request.contact_->phone_number_); CLEAN_INPUT_STRING(request.contact_->phone_number_);
CLEAN_INPUT_STRING(request.contact_->first_name_); CLEAN_INPUT_STRING(request.contact_->first_name_);
@ -6659,7 +6659,7 @@ void Td::on_request(uint64 id, td_api::importContacts &request) {
CHECK_IS_USER(); CHECK_IS_USER();
for (auto &contact : request.contacts_) { for (auto &contact : request.contacts_) {
if (contact == nullptr) { if (contact == nullptr) {
return send_error_raw(id, 5, "Contact must be non-empty"); return send_error_raw(id, 400, "Contact must be non-empty");
} }
CLEAN_INPUT_STRING(contact->phone_number_); CLEAN_INPUT_STRING(contact->phone_number_);
CLEAN_INPUT_STRING(contact->first_name_); CLEAN_INPUT_STRING(contact->first_name_);
@ -6693,7 +6693,7 @@ void Td::on_request(uint64 id, td_api::changeImportedContacts &request) {
CHECK_IS_USER(); CHECK_IS_USER();
for (auto &contact : request.contacts_) { for (auto &contact : request.contacts_) {
if (contact == nullptr) { if (contact == nullptr) {
return send_error_raw(id, 5, "Contact must be non-empty"); return send_error_raw(id, 400, "Contact must be non-empty");
} }
CLEAN_INPUT_STRING(contact->phone_number_); CLEAN_INPUT_STRING(contact->phone_number_);
CLEAN_INPUT_STRING(contact->first_name_); CLEAN_INPUT_STRING(contact->first_name_);
@ -7306,7 +7306,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
} }
if (value_constructor_id != td_api::optionValueInteger::ID && if (value_constructor_id != td_api::optionValueInteger::ID &&
value_constructor_id != td_api::optionValueEmpty::ID) { value_constructor_id != td_api::optionValueEmpty::ID) {
send_error_raw(id, 3, PSLICE() << "Option \"" << name << "\" must have integer value"); send_error_raw(id, 400, PSLICE() << "Option \"" << name << "\" must have integer value");
return true; return true;
} }
if (value_constructor_id == td_api::optionValueEmpty::ID) { if (value_constructor_id == td_api::optionValueEmpty::ID) {
@ -7314,7 +7314,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
} else { } else {
int64 value = static_cast<td_api::optionValueInteger *>(request.value_.get())->value_; int64 value = static_cast<td_api::optionValueInteger *>(request.value_.get())->value_;
if (value < min || value > max) { if (value < min || value > max) {
send_error_raw(id, 3, send_error_raw(id, 400,
PSLICE() << "Option's \"" << name << "\" value " << value << " is outside of a valid range [" PSLICE() << "Option's \"" << name << "\" value " << value << " is outside of a valid range ["
<< min << ", " << max << "]"); << min << ", " << max << "]");
return true; return true;
@ -7331,7 +7331,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
} }
if (value_constructor_id != td_api::optionValueBoolean::ID && if (value_constructor_id != td_api::optionValueBoolean::ID &&
value_constructor_id != td_api::optionValueEmpty::ID) { value_constructor_id != td_api::optionValueEmpty::ID) {
send_error_raw(id, 3, PSLICE() << "Option \"" << name << "\" must have boolean value"); send_error_raw(id, 400, PSLICE() << "Option \"" << name << "\" must have boolean value");
return true; return true;
} }
if (value_constructor_id == td_api::optionValueEmpty::ID) { if (value_constructor_id == td_api::optionValueEmpty::ID) {
@ -7349,7 +7349,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
return false; return false;
} }
if (value_constructor_id != td_api::optionValueString::ID && value_constructor_id != td_api::optionValueEmpty::ID) { if (value_constructor_id != td_api::optionValueString::ID && value_constructor_id != td_api::optionValueEmpty::ID) {
send_error_raw(id, 3, PSLICE() << "Option \"" << name << "\" must have string value"); send_error_raw(id, 400, PSLICE() << "Option \"" << name << "\" must have string value");
return true; return true;
} }
if (value_constructor_id == td_api::optionValueEmpty::ID) { if (value_constructor_id == td_api::optionValueEmpty::ID) {
@ -7362,7 +7362,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
if (check_value(value)) { if (check_value(value)) {
G()->shared_config().set_option_string(name, value); G()->shared_config().set_option_string(name, value);
} else { } else {
send_error_raw(id, 3, PSLICE() << "Option \"" << name << "\" can't have specified value"); send_error_raw(id, 400, PSLICE() << "Option \"" << name << "\" can't have specified value");
return true; return true;
} }
} }
@ -7380,7 +7380,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
if (!is_bot && request.name_ == "archive_and_mute_new_chats_from_unknown_users") { if (!is_bot && request.name_ == "archive_and_mute_new_chats_from_unknown_users") {
if (value_constructor_id != td_api::optionValueBoolean::ID && if (value_constructor_id != td_api::optionValueBoolean::ID &&
value_constructor_id != td_api::optionValueEmpty::ID) { value_constructor_id != td_api::optionValueEmpty::ID) {
return send_error_raw(id, 3, return send_error_raw(id, 400,
"Option \"archive_and_mute_new_chats_from_unknown_users\" must have boolean value"); "Option \"archive_and_mute_new_chats_from_unknown_users\" must have boolean value");
} }
@ -7444,12 +7444,13 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
} }
if (!is_bot && request.name_ == "ignore_sensitive_content_restrictions") { if (!is_bot && request.name_ == "ignore_sensitive_content_restrictions") {
if (!G()->shared_config().get_option_boolean("can_ignore_sensitive_content_restrictions")) { if (!G()->shared_config().get_option_boolean("can_ignore_sensitive_content_restrictions")) {
return send_error_raw(id, 3, "Option \"ignore_sensitive_content_restrictions\" can't be changed by the user"); return send_error_raw(id, 400,
"Option \"ignore_sensitive_content_restrictions\" can't be changed by the user");
} }
if (value_constructor_id != td_api::optionValueBoolean::ID && if (value_constructor_id != td_api::optionValueBoolean::ID &&
value_constructor_id != td_api::optionValueEmpty::ID) { value_constructor_id != td_api::optionValueEmpty::ID) {
return send_error_raw(id, 3, "Option \"ignore_sensitive_content_restrictions\" must have boolean value"); return send_error_raw(id, 400, "Option \"ignore_sensitive_content_restrictions\" must have boolean value");
} }
auto ignore_sensitive_content_restrictions = auto ignore_sensitive_content_restrictions =
@ -7497,7 +7498,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
if (request.name_ == "online") { if (request.name_ == "online") {
if (value_constructor_id != td_api::optionValueBoolean::ID && if (value_constructor_id != td_api::optionValueBoolean::ID &&
value_constructor_id != td_api::optionValueEmpty::ID) { value_constructor_id != td_api::optionValueEmpty::ID) {
return send_error_raw(id, 3, "Option \"online\" must have boolean value"); return send_error_raw(id, 400, "Option \"online\" must have boolean value");
} }
bool is_online = value_constructor_id == td_api::optionValueEmpty::ID || bool is_online = value_constructor_id == td_api::optionValueEmpty::ID ||
static_cast<const td_api::optionValueBoolean *>(request.value_.get())->value_; static_cast<const td_api::optionValueBoolean *>(request.value_.get())->value_;
@ -7553,7 +7554,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
case 'X': case 'X':
case 'x': { case 'x': {
if (request.name_.size() > 255) { if (request.name_.size() > 255) {
return send_error_raw(id, 3, "Option name is too long"); return send_error_raw(id, 400, "Option name is too long");
} }
switch (value_constructor_id) { switch (value_constructor_id) {
case td_api::optionValueBoolean::ID: case td_api::optionValueBoolean::ID:
@ -7589,7 +7590,7 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
break; break;
} }
return send_error_raw(id, 3, "Option can't be set"); return send_error_raw(id, 400, "Option can't be set");
} }
void Td::on_request(uint64 id, td_api::setPollAnswer &request) { void Td::on_request(uint64 id, td_api::setPollAnswer &request) {