andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Do not apply expired message content early.

Browse Source 
GitOrigin-RevId: e49ba509e615a0f088b5aba7f03d722248ae9af0
This commit is contained in:
levlam 2020-04-21 01:39:44 +03:00
parent c6d06e41db
commit 35e421a23d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/MessageContent.cpp
View File

@ -4841,7 +4841,7 @@ void update_expired_message_content(unique_ptr<MessageContent> &content) {
content = make_unique<MessageExpiredVideo>(); content = make_unique<MessageExpiredVideo>();
break; break;
case MessageContentType::Unsupported: case MessageContentType::Unsupported:
// can happen if message content file id is broken // can happen if message content file identifier is broken
break; break;
case MessageContentType::ExpiredPhoto: case MessageContentType::ExpiredPhoto:
case MessageContentType::ExpiredVideo: case MessageContentType::ExpiredVideo:

6
td/telegram/MessagesManager.cpp
View File

@ -27506,10 +27506,16 @@ bool MessagesManager::update_message_content(DialogId dialog_id, Message *old_me
auto old_file_id = get_message_content_any_file_id(old_content.get()); auto old_file_id = get_message_content_any_file_id(old_content.get());
bool need_finish_upload = old_file_id.is_valid() && need_merge_files; bool need_finish_upload = old_file_id.is_valid() && need_merge_files;
if (old_content_type != new_content_type) { if (old_content_type != new_content_type) {
if (old_message->ttl > 0 && old_message->ttl_expires_at > 0 &&
((new_content_type == MessageContentType::ExpiredPhoto && old_content_type == MessageContentType::Photo) ||
(new_content_type == MessageContentType::ExpiredVideo && old_content_type == MessageContentType::Video))) {
LOG(INFO) << "Do not apply expired message content early";
} else {
need_update = true; need_update = true;
LOG(INFO) << "Message content has changed its type from " << old_content_type << " to " << new_content_type; LOG(INFO) << "Message content has changed its type from " << old_content_type << " to " << new_content_type;
old_message->is_content_secret = is_secret_message_content(old_message->ttl, new_content->get_type()); old_message->is_content_secret = is_secret_message_content(old_message->ttl, new_content->get_type());
}
if (need_merge_files && old_file_id.is_valid()) { if (need_merge_files && old_file_id.is_valid()) {
auto new_file_id = get_message_content_any_file_id(new_content.get()); auto new_file_id = get_message_content_any_file_id(new_content.get());