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

renames

Browse Source
This commit is contained in:
Mike Dilger 2023-08-19 10:32:56 +12:00
parent 2bb6182c07
commit 2f5ef1b117
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/delegation.rs
View File

@ -54,11 +54,11 @@ impl Delegation {
}
}
pub fn load_through_settings(&self) -> Result<(), Error> {
pub fn load(&self) -> Result<(), Error> {
self.set(&GLOBALS.storage.read_setting_delegatee_tag())
}
pub async fn save_through_settings(&self) -> Result<(), Error> {
pub async fn save(&self) -> Result<(), Error> {
GLOBALS
.storage
.write_setting_delegatee_tag(&self.get_delegatee_tag_as_str(), None)?;

14
src/overlord/mod.rs
View File

@ -118,7 +118,7 @@ impl Overlord {
// Create a person record for every person seen
// Load delegation tag
GLOBALS.delegation.load_through_settings()?;
GLOBALS.delegation.load()?;
// Initialize the relay picker
GLOBALS.relay_picker.init().await?;
@ -534,7 +534,7 @@ impl Overlord {
ToOverlordMessage::DeletePub => {
GLOBALS.signer.clear_public_key();
Self::delegation_reset().await?;
GLOBALS.signer.save_through_settings().await?;
GLOBALS.signer.save().await?;
}
ToOverlordMessage::DropRelay(relay_url) => {
let _ = self.to_minions.send(ToMinionMessage {
@ -581,7 +581,7 @@ impl Overlord {
ToOverlordMessage::GeneratePrivateKey(mut password) => {
GLOBALS.signer.generate_private_key(&password)?;
password.zeroize();
GLOBALS.signer.save_through_settings().await?;
GLOBALS.signer.save().await?;
}
ToOverlordMessage::HideOrShowRelay(relay_url, hidden) => {
if let Some(mut relay) = GLOBALS.storage.read_relay(&relay_url)? {
@ -595,7 +595,7 @@ impl Overlord {
GLOBALS.signer.set_encrypted_private_key(epk);
GLOBALS.signer.unlock_encrypted_private_key(&password)?;
password.zeroize();
GLOBALS.signer.save_through_settings().await?;
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);
@ -610,7 +610,7 @@ impl Overlord {
let privkey = maybe_pk1.unwrap_or_else(|_| maybe_pk2.unwrap());
GLOBALS.signer.set_private_key(privkey, &password)?;
password.zeroize();
GLOBALS.signer.save_through_settings().await?;
GLOBALS.signer.save().await?;
}
}
}
@ -625,7 +625,7 @@ impl Overlord {
} else {
let pubkey = maybe_pk1.unwrap_or_else(|_| maybe_pk2.unwrap());
GLOBALS.signer.set_public_key(pubkey);
GLOBALS.signer.save_through_settings().await?;
GLOBALS.signer.save().await?;
}
}
ToOverlordMessage::Like(id, pubkey) => {
@ -1707,7 +1707,7 @@ impl Overlord {
async fn delegation_reset() -> Result<(), Error> {
if GLOBALS.delegation.reset() {
// save and statusmsg
GLOBALS.delegation.save_through_settings().await?;
GLOBALS.delegation.save().await?;
GLOBALS
.status_queue
.write()

12
src/signer.rs
View File

@ -26,7 +26,7 @@ impl Signer {
Ok(())
}
pub async fn save_through_settings(&self) -> Result<(), Error> {
pub async fn save(&self) -> Result<(), Error> {
GLOBALS
.storage
.write_setting_public_key(&self.public.read(), None)?;
@ -91,7 +91,7 @@ impl Signer {
Some(private.export_encrypted(pass, GLOBALS.storage.read_setting_log_n())?);
// and eventually save
task::spawn(async move {
if let Err(e) = GLOBALS.signer.save_through_settings().await {
if let Err(e) = GLOBALS.signer.save().await {
tracing::error!("{}", e);
}
});
@ -133,7 +133,7 @@ impl Signer {
let epk = pk.export_encrypted(new, GLOBALS.storage.read_setting_log_n())?;
*self.encrypted.write() = Some(epk);
task::spawn(async move {
if let Err(e) = GLOBALS.signer.save_through_settings().await {
if let Err(e) = GLOBALS.signer.save().await {
tracing::error!("{}", e);
}
GLOBALS
@ -206,7 +206,7 @@ impl Signer {
*self.encrypted.write() = Some(epk);
*self.private.write() = Some(pk);
task::spawn(async move {
if let Err(e) = GLOBALS.signer.save_through_settings().await {
if let Err(e) = GLOBALS.signer.save().await {
tracing::error!("{}", e);
}
});
@ -231,7 +231,7 @@ impl Signer {
*self.encrypted.write() = Some(epk);
*self.private.write() = Some(pk);
task::spawn(async move {
if let Err(e) = GLOBALS.signer.save_through_settings().await {
if let Err(e) = GLOBALS.signer.save().await {
tracing::error!("{}", e);
}
});
@ -247,7 +247,7 @@ impl Signer {
*self.public.write() = None;
task::spawn(async move {
if let Err(e) = GLOBALS.signer.save_through_settings().await {
if let Err(e) = GLOBALS.signer.save().await {
tracing::error!("{}", e);
}
});

2
src/ui/you/delegation.rs
View File

@ -73,7 +73,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
app.delegatee_tag_str = "".to_owned();
// save and statusmsg
task::spawn(async move {
if let Err(e) = GLOBALS.delegation.save_through_settings().await {
if let Err(e) = GLOBALS.delegation.save().await {
tracing::error!("{}", e);
}
GLOBALS.status_queue.write().write(format!(