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

Check and fix max_video_file_size.

Browse Source
This commit is contained in:
levlam 2023-02-03 16:49:17 +03:00
parent 7556ef4b18
commit 810b58d55a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/generate/scheme/td_api.tl
View File

@ -4834,7 +4834,7 @@ autosaveSettingsScopeChat chat_id:int53 = AutosaveSettingsScope;
//@description Contains autosave settings for an autosave settings scope //@description Contains autosave settings for an autosave settings scope
//@autosave_photos True, if photo autosave is enabled //@autosave_photos True, if photo autosave is enabled
//@autosave_videos True, if video autosave is enabled //@autosave_videos True, if video autosave is enabled
//@max_video_file_size The maximum size of a video file to be autosaved, in bytes; 0 if not limited //@max_video_file_size The maximum size of a video file to be autosaved, in bytes; 512 KB - 4000 MB
scopeAutosaveSettings autosave_photos:Bool autosave_videos:Bool max_video_file_size:int53 = ScopeAutosaveSettings; scopeAutosaveSettings autosave_photos:Bool autosave_videos:Bool max_video_file_size:int53 = ScopeAutosaveSettings;
//@description Contains autosave settings for a chat, which overrides default settings for the corresponding scope //@description Contains autosave settings for a chat, which overrides default settings for the corresponding scope

10
td/telegram/AutosaveManager.cpp
View File

@ -12,6 +12,7 @@
#include "td/utils/algorithm.h" #include "td/utils/algorithm.h"
#include "td/utils/buffer.h" #include "td/utils/buffer.h"
#include "td/utils/misc.h"
namespace td { namespace td {
@ -128,7 +129,7 @@ AutosaveManager::DialogAutosaveSettings::DialogAutosaveSettings(const telegram_a
are_inited_ = true; are_inited_ = true;
autosave_photos_ = settings->photos_; autosave_photos_ = settings->photos_;
autosave_videos_ = settings->videos_; autosave_videos_ = settings->videos_;
max_video_file_size_ = settings->video_max_size_; max_video_file_size_ = clamp(settings->video_max_size_, MIN_MAX_VIDEO_FILE_SIZE, MAX_MAX_VIDEO_FILE_SIZE);
} }
AutosaveManager::DialogAutosaveSettings::DialogAutosaveSettings(const td_api::scopeAutosaveSettings *settings) { AutosaveManager::DialogAutosaveSettings::DialogAutosaveSettings(const td_api::scopeAutosaveSettings *settings) {
@ -138,7 +139,7 @@ AutosaveManager::DialogAutosaveSettings::DialogAutosaveSettings(const td_api::sc
are_inited_ = true; are_inited_ = true;
autosave_photos_ = settings->autosave_photos_; autosave_photos_ = settings->autosave_photos_;
autosave_videos_ = settings->autosave_videos_; autosave_videos_ = settings->autosave_videos_;
max_video_file_size_ = settings->max_video_file_size_; max_video_file_size_ = clamp(settings->max_video_file_size_, MIN_MAX_VIDEO_FILE_SIZE, MAX_MAX_VIDEO_FILE_SIZE);
} }
telegram_api::object_ptr<telegram_api::autoSaveSettings> telegram_api::object_ptr<telegram_api::autoSaveSettings>
@ -205,7 +206,6 @@ void AutosaveManager::reload_autosave_settings(Promise<td_api::object_ptr<td_api
void AutosaveManager::on_get_autosave_settings( void AutosaveManager::on_get_autosave_settings(
Result<telegram_api::object_ptr<telegram_api::account_autoSaveSettings>> r_settings) { Result<telegram_api::object_ptr<telegram_api::account_autoSaveSettings>> r_settings) {
CHECK(!settings_.are_inited_);
if (G()->close_flag() && r_settings.is_ok()) { if (G()->close_flag() && r_settings.is_ok()) {
r_settings = Global::request_aborted_error(); r_settings = Global::request_aborted_error();
} }
@ -214,9 +214,10 @@ void AutosaveManager::on_get_autosave_settings(
} }
auto settings = r_settings.move_as_ok(); auto settings = r_settings.move_as_ok();
settings_.are_inited_ = true;
td_->contacts_manager_->on_get_users(std::move(settings->users_), "on_get_autosave_settings"); td_->contacts_manager_->on_get_users(std::move(settings->users_), "on_get_autosave_settings");
td_->contacts_manager_->on_get_chats(std::move(settings->chats_), "on_get_autosave_settings"); td_->contacts_manager_->on_get_chats(std::move(settings->chats_), "on_get_autosave_settings");
settings_.are_inited_ = true;
settings_.user_settings_ = DialogAutosaveSettings(settings->users_settings_.get()); settings_.user_settings_ = DialogAutosaveSettings(settings->users_settings_.get());
settings_.chat_settings_ = DialogAutosaveSettings(settings->chats_settings_.get()); settings_.chat_settings_ = DialogAutosaveSettings(settings->chats_settings_.get());
settings_.broadcast_settings_ = DialogAutosaveSettings(settings->broadcasts_settings_.get()); settings_.broadcast_settings_ = DialogAutosaveSettings(settings->broadcasts_settings_.get());
@ -275,6 +276,7 @@ void AutosaveManager::set_autosave_settings(td_api::object_ptr<td_api::AutosaveS
} }
if (!dialog_id.is_valid()) { if (!dialog_id.is_valid()) {
new_settings.are_inited_ = true; new_settings.are_inited_ = true;
new_settings.max_video_file_size_ = DialogAutosaveSettings::DEFAULT_MAX_VIDEO_FILE_SIZE;
} }
if (*old_settings == new_settings) { if (*old_settings == new_settings) {
return promise.set_value(Unit()); return promise.set_value(Unit());

4
td/telegram/AutosaveManager.h
View File

@ -41,6 +41,10 @@ class AutosaveManager final : public Actor {
bool autosave_videos_ = false; bool autosave_videos_ = false;
int64 max_video_file_size_ = 0; int64 max_video_file_size_ = 0;
static constexpr int64 MIN_MAX_VIDEO_FILE_SIZE = 512 * 1024;
static constexpr int64 DEFAULT_MAX_VIDEO_FILE_SIZE = 100 * 1024 * 1024;
static constexpr int64 MAX_MAX_VIDEO_FILE_SIZE = static_cast<int64>(4000) * 1024 * 1024;
DialogAutosaveSettings() = default; DialogAutosaveSettings() = default;
explicit DialogAutosaveSettings(const telegram_api::autoSaveSettings *settings); explicit DialogAutosaveSettings(const telegram_api::autoSaveSettings *settings);