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

Improve TTL spelling.

Browse Source
This commit is contained in:
levlam 2021-02-02 02:33:48 +03:00
parent 642a9a9efb
commit 0cdb0388ee
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
td/telegram/MessagesManager.cpp
View File

@ -8572,7 +8572,7 @@ void MessagesManager::do_send_media(DialogId dialog_id, Message *m, FileId file_
bool have_input_thumbnail = input_thumbnail != nullptr; bool have_input_thumbnail = input_thumbnail != nullptr;
LOG(INFO) << "Do send media file " << file_id << " with thumbnail " << thumbnail_file_id LOG(INFO) << "Do send media file " << file_id << " with thumbnail " << thumbnail_file_id
<< ", have_input_file = " << have_input_file << ", have_input_thumbnail = " << have_input_thumbnail << ", have_input_file = " << have_input_file << ", have_input_thumbnail = " << have_input_thumbnail
<< ", ttl = " << m->ttl; << ", TTL = " << m->ttl;
MessageContent *content = nullptr; MessageContent *content = nullptr;
if (m->message_id.is_any_server()) { if (m->message_id.is_any_server()) {
@ -12906,13 +12906,13 @@ void MessagesManager::on_secret_chat_screenshot_taken(SecretChatId secret_chat_i
void MessagesManager::on_secret_chat_ttl_changed(SecretChatId secret_chat_id, UserId user_id, MessageId message_id, void MessagesManager::on_secret_chat_ttl_changed(SecretChatId secret_chat_id, UserId user_id, MessageId message_id,
int32 date, int32 ttl, int64 random_id, Promise<> promise) { int32 date, int32 ttl, int64 random_id, Promise<> promise) {
LOG(DEBUG) << "On ttl set in " << secret_chat_id << " to " << ttl; LOG(DEBUG) << "On TTL set in " << secret_chat_id << " to " << ttl;
CHECK(secret_chat_id.is_valid()); CHECK(secret_chat_id.is_valid());
CHECK(user_id.is_valid()); CHECK(user_id.is_valid());
CHECK(message_id.is_valid()); CHECK(message_id.is_valid());
CHECK(date > 0); CHECK(date > 0);
if (ttl < 0) { if (ttl < 0) {
LOG(WARNING) << "Receive wrong ttl = " << ttl; LOG(WARNING) << "Receive wrong TTL = " << ttl;
promise.set_value(Unit()); promise.set_value(Unit());
return; return;
} }
@ -13227,7 +13227,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
int32 ttl = message_info.ttl; int32 ttl = message_info.ttl;
bool is_content_secret = is_secret_message_content(ttl, content_type); // should be calculated before TTL is adjusted bool is_content_secret = is_secret_message_content(ttl, content_type); // should be calculated before TTL is adjusted
if (ttl < 0) { if (ttl < 0) {
LOG(ERROR) << "Wrong ttl = " << ttl << " received in " << message_id << " in " << dialog_id; LOG(ERROR) << "Wrong TTL = " << ttl << " received in " << message_id << " in " << dialog_id;
ttl = 0; ttl = 0;
} else if (ttl > 0) { } else if (ttl > 0) {
ttl = max(ttl, get_message_content_duration(message_info.content.get(), td_) + 1); ttl = max(ttl, get_message_content_duration(message_info.content.get(), td_) + 1);
@ -25146,7 +25146,7 @@ void MessagesManager::edit_inline_message_media(const string &inline_message_id,
} }
InputMessageContent content = r_input_message_content.move_as_ok(); InputMessageContent content = r_input_message_content.move_as_ok();
if (content.ttl > 0) { if (content.ttl > 0) {
LOG(ERROR) << "Have message content with ttl " << content.ttl; LOG(ERROR) << "Have message content with TTL " << content.ttl;
return promise.set_error(Status::Error(5, "Can't enable self-destruction for media")); return promise.set_error(Status::Error(5, "Can't enable self-destruction for media"));
} }
@ -26262,14 +26262,14 @@ Result<vector<MessageId>> MessagesManager::resend_messages(DialogId dialog_id, v
Result<MessageId> MessagesManager::send_dialog_set_ttl_message(DialogId dialog_id, int32 ttl) { Result<MessageId> MessagesManager::send_dialog_set_ttl_message(DialogId dialog_id, int32 ttl) {
if (dialog_id.get_type() != DialogType::SecretChat) { if (dialog_id.get_type() != DialogType::SecretChat) {
return Status::Error(5, "Can't set chat ttl in non-secret chat"); return Status::Error(5, "Can't set message TTL in non-secret chat");
} }
if (ttl < 0) { if (ttl < 0) {
return Status::Error(5, "Message ttl can't be negative"); return Status::Error(5, "Message TTL can't be negative");
} }
LOG(INFO) << "Begin to set ttl in " << dialog_id << " to " << ttl; LOG(INFO) << "Begin to set message TTL in " << dialog_id << " to " << ttl;
Dialog *d = get_dialog_force(dialog_id); Dialog *d = get_dialog_force(dialog_id);
if (d == nullptr) { if (d == nullptr) {
@ -32223,7 +32223,7 @@ MessagesManager::Message *MessagesManager::add_scheduled_message_to_dialog(Dialo
return nullptr; return nullptr;
} }
if (message->ttl != 0 || message->ttl_expires_at != 0) { if (message->ttl != 0 || message->ttl_expires_at != 0) {
LOG(ERROR) << "Tried to add " << message_id << " with ttl " << message->ttl << "/" << message->ttl_expires_at LOG(ERROR) << "Tried to add " << message_id << " with TTL " << message->ttl << "/" << message->ttl_expires_at
<< " to " << dialog_id << " from " << source; << " to " << dialog_id << " from " << source;
debug_add_message_to_dialog_fail_reason_ = "skip adding secret scheduled message"; debug_add_message_to_dialog_fail_reason_ = "skip adding secret scheduled message";
return nullptr; return nullptr;

2
td/telegram/Photo.cpp
View File

@ -834,7 +834,7 @@ tl_object_ptr<telegram_api::InputMedia> photo_get_input_media(FileManager *file_
if (ttl != 0) { if (ttl != 0) {
flags |= telegram_api::inputMediaPhotoExternal::TTL_SECONDS_MASK; flags |= telegram_api::inputMediaPhotoExternal::TTL_SECONDS_MASK;
} }
LOG(INFO) << "Create inputMediaPhotoExternal with a URL " << file_view.url() << " and ttl " << ttl; LOG(INFO) << "Create inputMediaPhotoExternal with a URL " << file_view.url() << " and TTL " << ttl;
return make_tl_object<telegram_api::inputMediaPhotoExternal>(flags, file_view.url(), ttl); return make_tl_object<telegram_api::inputMediaPhotoExternal>(flags, file_view.url(), ttl);
} }
if (input_file == nullptr) { if (input_file == nullptr) {

2
td/telegram/Td.cpp
View File

@ -1869,7 +1869,7 @@ class CreateNewSecretChatRequest : public RequestActor<SecretChatId> {
// But since the update may still be on its way, we will update essential fields here. // But since the update may still be on its way, we will update essential fields here.
td->contacts_manager_->on_update_secret_chat( td->contacts_manager_->on_update_secret_chat(
secret_chat_id_, 0 /* no access_hash */, user_id_, SecretChatState::Unknown, true /* it is outbound chat */, secret_chat_id_, 0 /* no access_hash */, user_id_, SecretChatState::Unknown, true /* it is outbound chat */,
-1 /* unknown ttl */, 0 /* unknown creation date */, "" /* no key_hash */, 0, FolderId()); -1 /* unknown TTL */, 0 /* unknown creation date */, "" /* no key_hash */, 0, FolderId());
DialogId dialog_id(secret_chat_id_); DialogId dialog_id(secret_chat_id_);
td->messages_manager_->force_create_dialog(dialog_id, "create new secret chat", true); td->messages_manager_->force_create_dialog(dialog_id, "create new secret chat", true);
send_result(td->messages_manager_->get_chat_object(dialog_id)); send_result(td->messages_manager_->get_chat_object(dialog_id));