mirror of
https://github.com/mikedilger/gossip.git
synced 2024-09-19 19:46:50 +00:00
BusMessage.target is no longer needed (it is now always overlord)
This commit is contained in:
parent
6daf59c781
commit
4b70a761f4
@ -6,9 +6,6 @@ use zeroize::Zeroize;
|
|||||||
/// This is a message sent to the Overlord
|
/// This is a message sent to the Overlord
|
||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
pub struct BusMessage {
|
pub struct BusMessage {
|
||||||
/// Indended recipient of the message
|
|
||||||
pub target: String,
|
|
||||||
|
|
||||||
/// What kind of message is this
|
/// What kind of message is this
|
||||||
pub kind: String,
|
pub kind: String,
|
||||||
|
|
||||||
|
@ -93,7 +93,6 @@ async fn tokio_main() {
|
|||||||
pub fn initiate_shutdown() -> Result<(), Error> {
|
pub fn initiate_shutdown() -> Result<(), Error> {
|
||||||
let to_overlord = GLOBALS.to_overlord.clone();
|
let to_overlord = GLOBALS.to_overlord.clone();
|
||||||
let _ = to_overlord.send(BusMessage {
|
let _ = to_overlord.send(BusMessage {
|
||||||
target: "all".to_string(),
|
|
||||||
kind: "shutdown".to_string(),
|
kind: "shutdown".to_string(),
|
||||||
json_payload: serde_json::to_string("").unwrap(),
|
json_payload: serde_json::to_string("").unwrap(),
|
||||||
}); // ignore errors
|
}); // ignore errors
|
||||||
|
@ -263,7 +263,6 @@ impl Minion {
|
|||||||
|
|
||||||
async fn tell_overlord_we_are_ready(&self) -> Result<(), Error> {
|
async fn tell_overlord_we_are_ready(&self) -> Result<(), Error> {
|
||||||
self.to_overlord.send(BusMessage {
|
self.to_overlord.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "minion_is_ready".to_string(),
|
kind: "minion_is_ready".to_string(),
|
||||||
json_payload: "".to_owned(),
|
json_payload: "".to_owned(),
|
||||||
})?;
|
})?;
|
||||||
|
@ -357,15 +357,11 @@ impl Overlord {
|
|||||||
|
|
||||||
async fn handle_bus_message(&mut self, bus_message: BusMessage) -> Result<bool, Error> {
|
async fn handle_bus_message(&mut self, bus_message: BusMessage) -> Result<bool, Error> {
|
||||||
#[allow(clippy::single_match)] // because temporarily so
|
#[allow(clippy::single_match)] // because temporarily so
|
||||||
match &*bus_message.target {
|
match &*bus_message.kind {
|
||||||
"all" => match &*bus_message.kind {
|
|
||||||
"shutdown" => {
|
"shutdown" => {
|
||||||
tracing::info!("Overlord shutting down");
|
tracing::info!("Overlord shutting down");
|
||||||
return Ok(false);
|
return Ok(false);
|
||||||
}
|
}
|
||||||
_ => {}
|
|
||||||
},
|
|
||||||
"overlord" => match &*bus_message.kind {
|
|
||||||
"minion_is_ready" => {}
|
"minion_is_ready" => {}
|
||||||
"save_settings" => {
|
"save_settings" => {
|
||||||
GLOBALS.settings.read().await.save().await?;
|
GLOBALS.settings.read().await.save().await?;
|
||||||
@ -443,8 +439,7 @@ impl Overlord {
|
|||||||
let maybe_pk1 = PublicKey::try_from_bech32_string(&pubstr);
|
let maybe_pk1 = PublicKey::try_from_bech32_string(&pubstr);
|
||||||
let maybe_pk2 = PublicKey::try_from_hex_string(&pubstr);
|
let maybe_pk2 = PublicKey::try_from_hex_string(&pubstr);
|
||||||
if maybe_pk1.is_err() && maybe_pk2.is_err() {
|
if maybe_pk1.is_err() && maybe_pk2.is_err() {
|
||||||
*GLOBALS.status_message.write().await =
|
*GLOBALS.status_message.write().await = "Public key not recognized.".to_owned();
|
||||||
"Public key not recognized.".to_owned();
|
|
||||||
} else {
|
} else {
|
||||||
let pubkey = maybe_pk1.unwrap_or_else(|_| maybe_pk2.unwrap());
|
let pubkey = maybe_pk1.unwrap_or_else(|_| maybe_pk2.unwrap());
|
||||||
GLOBALS.signer.write().await.set_public_key(pubkey);
|
GLOBALS.signer.write().await.set_public_key(pubkey);
|
||||||
@ -467,8 +462,7 @@ impl Overlord {
|
|||||||
for relay in dirty_relays.iter() {
|
for relay in dirty_relays.iter() {
|
||||||
// Just update 'post' since that's all 'dirty' indicates currently
|
// Just update 'post' since that's all 'dirty' indicates currently
|
||||||
DbRelay::update_post(relay.url.to_owned(), relay.post).await?;
|
DbRelay::update_post(relay.url.to_owned(), relay.post).await?;
|
||||||
if let Some(relay) =
|
if let Some(relay) = GLOBALS.relays.write().await.get_mut(&Url::new(&relay.url))
|
||||||
GLOBALS.relays.write().await.get_mut(&Url::new(&relay.url))
|
|
||||||
{
|
{
|
||||||
relay.dirty = false;
|
relay.dirty = false;
|
||||||
}
|
}
|
||||||
@ -494,8 +488,8 @@ impl Overlord {
|
|||||||
|
|
||||||
let _ = tokio::spawn(async move {
|
let _ = tokio::spawn(async move {
|
||||||
for (event, url, sub) in GLOBALS.incoming_events.write().await.drain(..) {
|
for (event, url, sub) in GLOBALS.incoming_events.write().await.drain(..) {
|
||||||
let _ = crate::process::process_new_event(&event, true, Some(url), sub)
|
let _ =
|
||||||
.await;
|
crate::process::process_new_event(&event, true, Some(url), sub).await;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -522,8 +516,6 @@ impl Overlord {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
},
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
|
@ -86,7 +86,6 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram
|
|||||||
{
|
{
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "get_missing_events".to_string(),
|
kind: "get_missing_events".to_string(),
|
||||||
json_payload: serde_json::to_string("").unwrap(),
|
json_payload: serde_json::to_string("").unwrap(),
|
||||||
});
|
});
|
||||||
@ -100,7 +99,6 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram
|
|||||||
{
|
{
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "process_incoming_events".to_string(),
|
kind: "process_incoming_events".to_string(),
|
||||||
json_payload: serde_json::to_string("").unwrap(),
|
json_payload: serde_json::to_string("").unwrap(),
|
||||||
});
|
});
|
||||||
@ -156,7 +154,6 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram
|
|||||||
match app.replying_to {
|
match app.replying_to {
|
||||||
Some(_id) => {
|
Some(_id) => {
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "post_reply".to_string(),
|
kind: "post_reply".to_string(),
|
||||||
json_payload: serde_json::to_string(&(
|
json_payload: serde_json::to_string(&(
|
||||||
&app.draft,
|
&app.draft,
|
||||||
@ -167,7 +164,6 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram
|
|||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "post_textnote".to_string(),
|
kind: "post_textnote".to_string(),
|
||||||
json_payload: serde_json::to_string(&app.draft).unwrap(),
|
json_payload: serde_json::to_string(&app.draft).unwrap(),
|
||||||
});
|
});
|
||||||
@ -457,7 +453,6 @@ fn render_post_actual(
|
|||||||
}
|
}
|
||||||
if ui.button("Update Metadata").clicked() {
|
if ui.button("Update Metadata").clicked() {
|
||||||
let _ = GLOBALS.to_overlord.send(BusMessage {
|
let _ = GLOBALS.to_overlord.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "update_metadata".to_string(),
|
kind: "update_metadata".to_string(),
|
||||||
json_payload: serde_json::to_string(
|
json_payload: serde_json::to_string(
|
||||||
&event.pubkey.as_hex_string(),
|
&event.pubkey.as_hex_string(),
|
||||||
@ -504,7 +499,6 @@ fn render_post_actual(
|
|||||||
if ui.add(LikeButton {}).clicked() {
|
if ui.add(LikeButton {}).clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "like".to_string(),
|
kind: "like".to_string(),
|
||||||
json_payload: serde_json::to_string(&(&event.id, &event.pubkey))
|
json_payload: serde_json::to_string(&(&event.id, &event.pubkey))
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
|
@ -26,7 +26,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if ui.button("follow").clicked() {
|
if ui.button("follow").clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "follow_nip35".to_string(),
|
kind: "follow_nip35".to_string(),
|
||||||
json_payload: serde_json::to_string(&app.nip35follow).unwrap(),
|
json_payload: serde_json::to_string(&app.nip35follow).unwrap(),
|
||||||
});
|
});
|
||||||
@ -50,7 +49,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if ui.button("follow").clicked() {
|
if ui.button("follow").clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "follow_bech32".to_string(),
|
kind: "follow_bech32".to_string(),
|
||||||
json_payload: serde_json::to_string(&(
|
json_payload: serde_json::to_string(&(
|
||||||
&app.follow_bech32_pubkey,
|
&app.follow_bech32_pubkey,
|
||||||
@ -79,7 +77,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if ui.button("follow").clicked() {
|
if ui.button("follow").clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "follow_hexkey".to_string(),
|
kind: "follow_hexkey".to_string(),
|
||||||
json_payload: serde_json::to_string(&(
|
json_payload: serde_json::to_string(&(
|
||||||
&app.follow_hex_pubkey,
|
&app.follow_hex_pubkey,
|
||||||
|
@ -58,7 +58,6 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
|
|||||||
|
|
||||||
if ui.button("UPDATE METADATA").clicked() {
|
if ui.button("UPDATE METADATA").clicked() {
|
||||||
let _ = GLOBALS.to_overlord.send(BusMessage {
|
let _ = GLOBALS.to_overlord.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "update_metadata".to_string(),
|
kind: "update_metadata".to_string(),
|
||||||
json_payload: serde_json::to_string(&pubkeyhex).unwrap(),
|
json_payload: serde_json::to_string(&pubkeyhex).unwrap(),
|
||||||
});
|
});
|
||||||
|
@ -26,7 +26,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if test_url.is_valid_relay_url() {
|
if test_url.is_valid_relay_url() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "add_relay".to_string(),
|
kind: "add_relay".to_string(),
|
||||||
json_payload: serde_json::to_string(&app.new_relay_url).unwrap(),
|
json_payload: serde_json::to_string(&app.new_relay_url).unwrap(),
|
||||||
});
|
});
|
||||||
@ -63,7 +62,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if ui.button("SAVE CHANGES").clicked() {
|
if ui.button("SAVE CHANGES").clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "save_relays".to_string(),
|
kind: "save_relays".to_string(),
|
||||||
json_payload: serde_json::to_string("").unwrap(),
|
json_payload: serde_json::to_string("").unwrap(),
|
||||||
});
|
});
|
||||||
|
@ -153,7 +153,6 @@ pub(super) fn update(
|
|||||||
// Tell the overlord to save them
|
// Tell the overlord to save them
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "save_settings".to_string(),
|
kind: "save_settings".to_string(),
|
||||||
json_payload: serde_json::to_string("").unwrap(),
|
json_payload: serde_json::to_string("").unwrap(),
|
||||||
});
|
});
|
||||||
|
@ -143,7 +143,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if ui.button("Unlock Private Key").clicked() {
|
if ui.button("Unlock Private Key").clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "unlock_key".to_string(),
|
kind: "unlock_key".to_string(),
|
||||||
json_payload: serde_json::to_string(&app.password).unwrap(),
|
json_payload: serde_json::to_string(&app.password).unwrap(),
|
||||||
});
|
});
|
||||||
@ -160,7 +159,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if ui.button("Generate Now").clicked() {
|
if ui.button("Generate Now").clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "generate_private_key".to_string(),
|
kind: "generate_private_key".to_string(),
|
||||||
json_payload: serde_json::to_string(&app.password).unwrap(),
|
json_payload: serde_json::to_string(&app.password).unwrap(),
|
||||||
});
|
});
|
||||||
@ -189,7 +187,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
if ui.button("import").clicked() {
|
if ui.button("import").clicked() {
|
||||||
let tx = GLOBALS.to_overlord.clone();
|
let tx = GLOBALS.to_overlord.clone();
|
||||||
let _ = tx.send(BusMessage {
|
let _ = tx.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "import_priv".to_string(),
|
kind: "import_priv".to_string(),
|
||||||
json_payload: serde_json::to_string(&(&app.import_priv, &app.password)).unwrap(),
|
json_payload: serde_json::to_string(&(&app.import_priv, &app.password)).unwrap(),
|
||||||
});
|
});
|
||||||
@ -228,7 +225,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
|
|
||||||
if ui.button("Delete this public key").clicked() {
|
if ui.button("Delete this public key").clicked() {
|
||||||
let _ = GLOBALS.to_overlord.send(BusMessage {
|
let _ = GLOBALS.to_overlord.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "delete_pub".to_string(),
|
kind: "delete_pub".to_string(),
|
||||||
json_payload: serde_json::to_string(&app.import_pub).unwrap(),
|
json_payload: serde_json::to_string(&app.import_pub).unwrap(),
|
||||||
});
|
});
|
||||||
@ -239,7 +235,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
ui.add(TextEdit::singleline(&mut app.import_pub).hint_text("npub1 or hex"));
|
ui.add(TextEdit::singleline(&mut app.import_pub).hint_text("npub1 or hex"));
|
||||||
if ui.button("Import a Public Key").clicked() {
|
if ui.button("Import a Public Key").clicked() {
|
||||||
let _ = GLOBALS.to_overlord.send(BusMessage {
|
let _ = GLOBALS.to_overlord.send(BusMessage {
|
||||||
target: "overlord".to_string(),
|
|
||||||
kind: "import_pub".to_string(),
|
kind: "import_pub".to_string(),
|
||||||
json_payload: serde_json::to_string(&app.import_pub).unwrap(),
|
json_payload: serde_json::to_string(&app.import_pub).unwrap(),
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user