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

Never merge story content files.

Browse Source
This commit is contained in:
levlam 2023-06-13 12:46:31 +03:00
parent b46d311130
commit 55d33a8665
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/StoryContent.cpp
View File

@ -238,7 +238,7 @@ void compare_story_contents(const StoryContent *old_content, const StoryContent
}
void merge_story_contents(Td *td, const StoryContent *old_content, StoryContent *new_content, DialogId dialog_id,
bool need_merge_files, bool &is_content_changed, bool &need_update) {
bool &is_content_changed, bool &need_update) {
StoryContentType content_type = new_content->get_type();
CHECK(old_content->get_type() == content_type);
@ -246,19 +246,13 @@ void merge_story_contents(Td *td, const StoryContent *old_content, StoryContent
case StoryContentType::Photo: {
const auto *old_ = static_cast<const StoryContentPhoto *>(old_content);
auto *new_ = static_cast<StoryContentPhoto *>(new_content);
merge_photos(td, &old_->photo_, &new_->photo_, dialog_id, need_merge_files, is_content_changed, need_update);
merge_photos(td, &old_->photo_, &new_->photo_, dialog_id, false, is_content_changed, need_update);
break;
}
case StoryContentType::Video: {
const auto *old_ = static_cast<const StoryContentVideo *>(old_content);
const auto *new_ = static_cast<const StoryContentVideo *>(new_content);
if (old_->file_id_ != new_->file_id_) {
if (need_merge_files) {
td->videos_manager_->merge_videos(new_->file_id_, old_->file_id_);
}
need_update = true;
}
if (old_->alt_file_id_ != new_->alt_file_id_) {
if (old_->file_id_ != new_->file_id_ || old_->alt_file_id_ != new_->alt_file_id_) {
need_update = true;
}
break;

2
td/telegram/StoryContent.h
View File

@ -44,7 +44,7 @@ void compare_story_contents(Td *td, const StoryContent *old_content, const Story
bool &is_content_changed, bool &need_update);
void merge_story_contents(Td *td, const StoryContent *old_content, StoryContent *new_content, DialogId dialog_id,
bool need_merge_files, bool &is_content_changed, bool &need_update);
bool &is_content_changed, bool &need_update);
unique_ptr<StoryContent> copy_story_content(const StoryContent *content);

4
td/telegram/StoryManager.cpp
View File

@ -793,10 +793,8 @@ StoryId StoryManager::on_get_story(DialogId owner_dialog_id,
story->content_ = std::move(content);
is_changed = true;
} else {
merge_story_contents(td_, story->content_.get(), content.get(), owner_dialog_id, false, need_save_to_database,
is_changed);
merge_story_contents(td_, story->content_.get(), content.get(), owner_dialog_id, need_save_to_database, is_changed);
story->content_ = std::move(content);
// story->last_edit_pts_ = 0;
}
if (is_changed || need_save_to_database) {