golgi-ssb
/
golgi
4
5
Fork 0
Code Issues 11 Pull Requests 1 Projects 1 Releases Wiki Activity

Merge branch 'main' into create_history_stream_opts

This commit is contained in:
glyph 2022-08-09 10:14:38 +00:00
parent 1335aeb544 457dda6d2d
commit ad3a5ed932
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/error.rs
View File

@ -77,7 +77,7 @@ impl std::fmt::Display for GolgiError {
// TODO: improve this variant with a context message // TODO: improve this variant with a context message
// then have the core display msg be: "SSB RPC error: {}", context // then have the core display msg be: "SSB RPC error: {}", context
GolgiError::Rpc(ref err) => write!(f, "SSB RPC failure: {}", err), GolgiError::Rpc(ref err) => write!(f, "SSB RPC failure: {}", err),
GolgiError::Sbot(ref err) => write!(f, "Sbot returned an error response: {}", err), GolgiError::Sbot(ref err) => write!(f, "Sbot encountered an error: {}", err),
GolgiError::SigilLink(ref context) => write!(f, "SSB blob ID error: {}", context), GolgiError::SigilLink(ref context) => write!(f, "SSB blob ID error: {}", context),
GolgiError::SerdeJson(_) => write!(f, "Failed to serialize JSON slice"), GolgiError::SerdeJson(_) => write!(f, "Failed to serialize JSON slice"),
//GolgiError::WhoAmI(ref err) => write!(f, "{}", err), //GolgiError::WhoAmI(ref err) => write!(f, "{}", err),

34
src/sbot.rs
View File

@ -75,25 +75,35 @@ impl Sbot {
}; };
let OwnedIdentity { pk, sk, id } = match keystore { let OwnedIdentity { pk, sk, id } = match keystore {
Keystore::Patchwork => keystore::from_patchwork_local() Keystore::Patchwork => keystore::from_patchwork_local().await.map_err(|_err| {
.await GolgiError::Sbot(
.expect("couldn't read local patchwork secret from default location"), "sbot initialization error: couldn't read local patchwork secret from default location".to_string(),
Keystore::GoSbot => keystore::from_gosbot_local() )
.await })?,
.expect("couldn't read local go-sbot secret from default location"), Keystore::GoSbot => keystore::from_gosbot_local().await.map_err(|_err| {
GolgiError::Sbot(
"sbot initialization error: couldn't read local go-sbot secret from default location".to_string(),
)
})?,
Keystore::CustomGoSbot(key_path) => { Keystore::CustomGoSbot(key_path) => {
keystore::from_custom_gosbot_keypath(key_path.to_string()) keystore::from_custom_gosbot_keypath(key_path.to_string())
.await .await
.unwrap_or_else(|_| { .map_err(|_err| {
panic!("couldn't read local go-sbot secret from: {}", key_path) GolgiError::Sbot(format!(
}) "sbot initialization error: couldn't read local go-sbot secret from: {}",
key_path
))
})?
} }
Keystore::CustomPatchwork(key_path) => { Keystore::CustomPatchwork(key_path) => {
keystore::from_custom_patchwork_keypath(key_path.to_string()) keystore::from_custom_patchwork_keypath(key_path.to_string())
.await .await
.unwrap_or_else(|_| { .map_err(|_err| {
panic!("couldn't read local patchwork secret from: {}", key_path) GolgiError::Sbot(format!(
}) "sbot initialization error: couldn't read local patchwork secret from: {}",
key_path
))
})?
} }
}; };