Merge remote-tracking branch 'origin/main' into ark-merge

core/archipelago/src/server.rs

@@ -89,8 +89,10 @@ impl Server {
             if let Ok(loc) = serde_json::from_slice::<serde_json::Value>(&bytes) {
                 data.server_info.lat = loc.get("lat").and_then(|v| v.as_f64());
                 data.server_info.lon = loc.get("lon").and_then(|v| v.as_f64());
-                data.server_info.share_location =
-                    loc.get("share_location").and_then(|v| v.as_bool()).unwrap_or(false);
+                data.server_info.share_location = loc
+                    .get("share_location")
+                    .and_then(|v| v.as_bool())
+                    .unwrap_or(false);
             }
         }
         data.server_info.tor_address = docker_packages::read_tor_address("archipelago").await;
@@ -515,6 +517,10 @@ impl Server {
                                         &local_pubkey,
                                         local_fips_npub.as_deref(),
                                         local_name.as_deref(),
+                                        // Re-assert at the level WE hold for
+                                        // this peer; no invite token on heal.
+                                        None,
+                                        node.trust_level,
                                         |b| node_identity.sign(b),
                                     )
                                     .await
@@ -1261,8 +1267,9 @@ fn merge_preserving_transitional(
 /// scan is the owner: once podman reports a settled state and the id is no
 /// longer queued for a boot start, the fresh state wins immediately instead
 /// of being preserved for the transitional-stuck timeout.
-static SCANNER_RESTARTING: std::sync::LazyLock<std::sync::Mutex<std::collections::HashSet<String>>> =
-    std::sync::LazyLock::new(|| std::sync::Mutex::new(std::collections::HashSet::new()));
+static SCANNER_RESTARTING: std::sync::LazyLock<
+    std::sync::Mutex<std::collections::HashSet<String>>,
+> = std::sync::LazyLock::new(|| std::sync::Mutex::new(std::collections::HashSet::new()));
 
 fn take_scanner_restarting(id: &str) -> bool {
     SCANNER_RESTARTING