andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Add has_been_merged to DB

Browse source
This commit is contained in:
Andras Schmelczer 2025-10-19 11:47:55 +01:00
parent de143f9033
commit 12aa457e3a
6 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sync-server/src/server/update_document.rs
View file

@ -120,11 +120,12 @@ pub async fn update_document(
)));
}
let merged_content = if is_file_type_mergable(&sanitized_relative_path)
let are_all_participants_mergable = is_file_type_mergable(&sanitized_relative_path)
&& !is_binary(&parent_document.content)
&& !is_binary(&latest_version.content)
&& !is_binary(&content)
{
&& !is_binary(&content);
let merged_content = if are_all_participants_mergable {
reconcile(
str::from_utf8(&parent_document.content)
.expect("parent must be valid UTF-8 because it's not binary"),
@ -177,6 +178,7 @@ pub async fn update_document(
is_deleted: false,
user_id: user.name,
device_id: device_id.0,
has_been_merged: are_all_participants_mergable && is_different_from_request_content,
};
state