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 2024-07-27 17:15:01 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from MarcoBuster/disable-limits

Browse Source 
New option: disable file limit regardless of --local
This commit is contained in:
andrew-ld 2020-11-13 13:49:15 +01:00 committed by GitHub
commit da4f559e53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-entrypoint.sh
View File

@ -36,6 +36,9 @@ fi
if [ -n "$TELEGRAM_LOCAL" ]; then if [ -n "$TELEGRAM_LOCAL" ]; then
CUSTOM_ARGS="${CUSTOM_ARGS} --local" CUSTOM_ARGS="${CUSTOM_ARGS} --local"
fi fi
if [ -n "$TELEGRAM_NO_FILE_LIMIT" ]; then
CUSTOM_ARGS="${CUSTOM_ARGS} --no-file-limit"
fi
if [ -n "$TELEGRAM_INSECURE" ]; then if [ -n "$TELEGRAM_INSECURE" ]; then
CUSTOM_ARGS="${CUSTOM_ARGS} --insecure" CUSTOM_ARGS="${CUSTOM_ARGS} --insecure"
fi fi

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

@ -3805,7 +3805,7 @@ void Client::on_update_file(object_ptr<td_api::file> file) {
if (!is_file_being_downloaded(file_id)) { if (!is_file_being_downloaded(file_id)) {
return; return;
} }
if (!parameters_->local_mode_ && file->local_->downloaded_size_ > MAX_DOWNLOAD_FILE_SIZE) { if ((!parameters_->local_mode_ || !parameters_->no_file_limit_) && file->local_->downloaded_size_ > MAX_DOWNLOAD_FILE_SIZE) {
if (file->local_->is_downloading_active_) { if (file->local_->is_downloading_active_) {
send_request(make_object<td_api::cancelDownloadFile>(file_id, false), send_request(make_object<td_api::cancelDownloadFile>(file_id, false),
std::make_unique<TdOnCancelDownloadFileCallback>()); std::make_unique<TdOnCancelDownloadFileCallback>());
@ -7503,7 +7503,7 @@ td::Status Client::process_toggle_group_invites_query(PromisedQueryPtr &query) {
//end custom methods impl //end custom methods impl
void Client::do_get_file(object_ptr<td_api::file> file, PromisedQueryPtr query) { void Client::do_get_file(object_ptr<td_api::file> file, PromisedQueryPtr query) {
if (!parameters_->local_mode_ && if ((!parameters_->local_mode_ || !parameters_->no_file_limit_) &&
td::max(file->expected_size_, file->local_->downloaded_size_) > MAX_DOWNLOAD_FILE_SIZE) { // speculative check td::max(file->expected_size_, file->local_->downloaded_size_) > MAX_DOWNLOAD_FILE_SIZE) { // speculative check
return fail_query(400, "Bad Request: file is too big", std::move(query)); return fail_query(400, "Bad Request: file is too big", std::move(query));
} }

1
telegram-bot-api/ClientParameters.h
View File

@ -57,6 +57,7 @@ struct ClientParameters {
bool local_mode_ = false; bool local_mode_ = false;
bool allow_http_ = false; bool allow_http_ = false;
bool use_relative_path_ = false; bool use_relative_path_ = false;
bool no_file_limit_ = true;
td::int32 api_id_ = 0; td::int32 api_id_ = 0;
td::string api_hash_; td::string api_hash_;

4
telegram-bot-api/telegram-bot-api.cpp
View File

@ -169,8 +169,10 @@ int main(int argc, char *argv[]) {
options.set_usage(td::Slice(argv[0]), "--api-id=<arg> --api-hash=<arg> [--local] [OPTION]..."); options.set_usage(td::Slice(argv[0]), "--api-id=<arg> --api-hash=<arg> [--local] [OPTION]...");
options.set_description("Telegram Bot API server"); options.set_description("Telegram Bot API server");
options.add_option('h', "help", "display this help text and exit", [&] { need_print_usage = true; }); options.add_option('h', "help", "display this help text and exit", [&] { need_print_usage = true; });
options.add_option('\0', "local", "allow the Bot API server to serve local requests", options.add_option('\0', "local", "allow the Bot API server to serve local requests and disables the file limits",
[&] { parameters->local_mode_ = true; }); [&] { parameters->local_mode_ = true; });
options.add_option('\0', "no-file-limit", "disable the file limits",
[&] { parameters->no_file_limit_ = true; });
options.add_option('\0', "insecure", "allow the Bot API to send request via insecure HTTP", [&] { parameters->allow_http_ = true; }); options.add_option('\0', "insecure", "allow the Bot API to send request via insecure HTTP", [&] { parameters->allow_http_ = true; });
options.add_option('\0', "relative", "use relative file path in local mode", [&] { parameters->use_relative_path_ = true; }); options.add_option('\0', "relative", "use relative file path in local mode", [&] { parameters->use_relative_path_ = true; });