From 4ffdad8d8eec70ce47afb36049f96992653b5548 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 14 Dec 2023 12:44:07 +0100 Subject: remote imports do not overwrite local nodes --- server/src/import.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'server/src') diff --git a/server/src/import.rs b/server/src/import.rs index 37a592f..edf3eb0 100644 --- a/server/src/import.rs +++ b/server/src/import.rs @@ -191,7 +191,8 @@ async fn import_remote( debug!("adding {identifier}"); node.public.id = Some(identifier.to_owned()); - db.node.insert(&identifier, &node)?; + db.node + .fetch_and_update(&identifier, |pnode| Some(pnode.unwrap_or(node.clone())))?; node_path.push(opts.id.clone()); } -- cgit v1.2.3-70-g09d2