diff --git a/src/ui/feed.rs b/src/ui/feed.rs index c30aad12..d8a6002e 100644 --- a/src/ui/feed.rs +++ b/src/ui/feed.rs @@ -84,8 +84,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram .on_hover_text("Query Relays for Missing Events") .clicked() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "get_missing_events".to_string(), json_payload: serde_json::to_string("").unwrap(), }); @@ -97,8 +96,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram .on_hover_text("Process Queue of Incoming Events") .clicked() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "process_incoming_events".to_string(), json_payload: serde_json::to_string("").unwrap(), }); @@ -150,10 +148,9 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram ui.with_layout(Layout::right_to_left(Align::TOP), |ui| { if ui.button("Send").clicked() && !app.draft.is_empty() { - let tx = GLOBALS.to_overlord.clone(); match app.replying_to { Some(_id) => { - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "post_reply".to_string(), json_payload: serde_json::to_string(&( &app.draft, @@ -163,7 +160,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram }); } None => { - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "post_textnote".to_string(), json_payload: serde_json::to_string(&app.draft).unwrap(), }); @@ -497,8 +494,7 @@ fn render_post_actual( ui.add_space(24.0); if ui.add(LikeButton {}).clicked() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "like".to_string(), json_payload: serde_json::to_string(&(&event.id, &event.pubkey)) .unwrap(), diff --git a/src/ui/relays.rs b/src/ui/relays.rs index bb93f624..caa21616 100644 --- a/src/ui/relays.rs +++ b/src/ui/relays.rs @@ -24,8 +24,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr if ui.button("Add").clicked() { let test_url = Url::new(&app.new_relay_url); if test_url.is_valid_relay_url() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "add_relay".to_string(), json_payload: serde_json::to_string(&app.new_relay_url).unwrap(), }); @@ -60,8 +59,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr ui.with_layout(Layout::bottom_up(Align::Center), |ui| { if ui.button("SAVE CHANGES").clicked() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "save_relays".to_string(), json_payload: serde_json::to_string("").unwrap(), }); diff --git a/src/ui/settings.rs b/src/ui/settings.rs index 5848966d..f77aacff 100644 --- a/src/ui/settings.rs +++ b/src/ui/settings.rs @@ -151,8 +151,7 @@ pub(super) fn update( *GLOBALS.settings.blocking_write() = app.settings.clone(); // Tell the overlord to save them - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "save_settings".to_string(), json_payload: serde_json::to_string("").unwrap(), }); diff --git a/src/ui/you.rs b/src/ui/you.rs index 8195b7fa..27970d48 100644 --- a/src/ui/you.rs +++ b/src/ui/you.rs @@ -141,8 +141,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr }); if ui.button("Unlock Private Key").clicked() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "unlock_key".to_string(), json_payload: serde_json::to_string(&app.password).unwrap(), }); @@ -157,8 +156,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr ui.add(TextEdit::singleline(&mut app.password).password(true)); }); if ui.button("Generate Now").clicked() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "generate_private_key".to_string(), json_payload: serde_json::to_string(&app.password).unwrap(), }); @@ -185,8 +183,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr ui.add(TextEdit::singleline(&mut app.password).password(true)); }); if ui.button("import").clicked() { - let tx = GLOBALS.to_overlord.clone(); - let _ = tx.send(ToOverlordMessage { + let _ = GLOBALS.to_overlord.send(ToOverlordMessage { kind: "import_priv".to_string(), json_payload: serde_json::to_string(&(&app.import_priv, &app.password)).unwrap(), });