fix: Use base32 ID representation

OkuBrowser · Dec 11, 2024 · 665548a · 665548a
1 parent 53f258d
commit 665548a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/discovery.rs b/src/discovery.rs
@@ -80,8 +80,8 @@ impl OkuFs {
             .ok()
             .flatten()
             .ok_or(miette::miette!(
-                "Prior announcement not found in database for replica {:?} … ",
-                namespace_id
+                "Prior announcement not found in database for replica {} … ",
+                iroh_base::base32::fmt(namespace_id)
             ))?;
 
         let ticket = mainline::Bytes::from(

diff --git a/src/fs/core.rs b/src/fs/core.rs
@@ -40,7 +40,7 @@ impl OkuFs {
             .flatten()
             .ok_or(anyhow::anyhow!(
                 "Missing private key for default author ({}).",
-                default_author_id.fmt_short()
+                iroh_base::base32::fmt_short(default_author_id)
             ))
     }
 
@@ -92,7 +92,7 @@ impl OkuFs {
             .await?;
         info!(
             "Default author ID is {} … ",
-            docs_engine.client().authors().default().await?.fmt_short()
+            iroh_base::base32::fmt_short(docs_engine.client().authors().default().await?)
         );
 
         let (replica_sender, _replica_receiver) = watch::channel(());

diff --git a/src/fs/replica.rs b/src/fs/replica.rs
@@ -64,8 +64,10 @@ impl OkuFs {
             OkuFsError::CannotListReplicas
         })?;
         pin_mut!(replicas);
-        let mut replica_ids: Vec<(NamespaceId, CapabilityKind)> =
-            replicas.map(|replica| replica.unwrap()).collect().await;
+        let mut replica_ids: Vec<(NamespaceId, CapabilityKind)> = replicas
+            .filter_map(|replica| async move { replica.ok() })
+            .collect()
+            .await;
 
         let config = OkuFsConfig::load_or_create_config()?;
         if let Some(home_replica) = config.home_replica()? {