nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-29 08:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into unstable

Browse Source
This commit is contained in:
Mike Dilger 2023-09-18 06:51:22 +12:00
commit 69c4919a7c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/overlord/mod.rs
View File

@ -614,7 +614,7 @@ impl Overlord {
}));
}
ToOverlordMessage::FollowNprofile(nprofile) => {
match Profile::try_from_bech32_string(&nprofile, true) {
match Profile::try_from_bech32_string(&nprofile.trim(), true) {
Ok(np) => self.follow_nprofile(np).await?,
Err(e) => GLOBALS.status_queue.write().write(format!("{}", e)),
}
@ -638,8 +638,8 @@ impl Overlord {
password.zeroize();
GLOBALS.signer.save().await?;
} else {
let maybe_pk1 = PrivateKey::try_from_bech32_string(&import_priv);
let maybe_pk2 = PrivateKey::try_from_hex_string(&import_priv);
let maybe_pk1 = PrivateKey::try_from_bech32_string(&import_priv.trim());
let maybe_pk2 = PrivateKey::try_from_hex_string(&import_priv.trim());
import_priv.zeroize();
if maybe_pk1.is_err() && maybe_pk2.is_err() {
password.zeroize();
@ -656,8 +656,8 @@ impl Overlord {
}
}
ToOverlordMessage::ImportPub(pubstr) => {
let maybe_pk1 = PublicKey::try_from_bech32_string(&pubstr, true);
let maybe_pk2 = PublicKey::try_from_hex_string(&pubstr, true);
let maybe_pk1 = PublicKey::try_from_bech32_string(&pubstr.trim(), true);
let maybe_pk2 = PublicKey::try_from_hex_string(&pubstr.trim(), true);
if maybe_pk1.is_err() && maybe_pk2.is_err() {
GLOBALS
.status_queue
@ -939,7 +939,7 @@ impl Overlord {
pubkeystr: String,
relay: RelayUrl,
) -> Result<(), Error> {
let pubkey = match PublicKey::try_from_bech32_string(&pubkeystr, true) {
let pubkey = match PublicKey::try_from_bech32_string(&pubkeystr.trim(), true) {
Ok(pk) => pk,
Err(_) => PublicKey::try_from_hex_string(&pubkeystr, true)?,
};