Remove some unnecessary clone() and let bindings

This commit is contained in:
Mike Dilger 2023-01-06 15:49:00 +13:00
parent 1046be777f
commit 4dc747aeb6
4 changed files with 11 additions and 21 deletions

View File

@ -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") .on_hover_text("Query Relays for Missing Events")
.clicked() .clicked()
{ {
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
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(),
}); });
@ -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") .on_hover_text("Process Queue of Incoming Events")
.clicked() .clicked()
{ {
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
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(),
}); });
@ -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| { ui.with_layout(Layout::right_to_left(Align::TOP), |ui| {
if ui.button("Send").clicked() && !app.draft.is_empty() { if ui.button("Send").clicked() && !app.draft.is_empty() {
let tx = GLOBALS.to_overlord.clone();
match app.replying_to { match app.replying_to {
Some(_id) => { Some(_id) => {
let _ = tx.send(ToOverlordMessage { let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
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,
@ -163,7 +160,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, frame: &mut eframe::Fram
}); });
} }
None => { None => {
let _ = tx.send(ToOverlordMessage { let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
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(),
}); });
@ -497,8 +494,7 @@ fn render_post_actual(
ui.add_space(24.0); ui.add_space(24.0);
if ui.add(LikeButton {}).clicked() { if ui.add(LikeButton {}).clicked() {
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
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(),

View File

@ -24,8 +24,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
if ui.button("Add").clicked() { if ui.button("Add").clicked() {
let test_url = Url::new(&app.new_relay_url); let test_url = Url::new(&app.new_relay_url);
if test_url.is_valid_relay_url() { if test_url.is_valid_relay_url() {
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
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(),
}); });
@ -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| { ui.with_layout(Layout::bottom_up(Align::Center), |ui| {
if ui.button("SAVE CHANGES").clicked() { if ui.button("SAVE CHANGES").clicked() {
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
kind: "save_relays".to_string(), kind: "save_relays".to_string(),
json_payload: serde_json::to_string("").unwrap(), json_payload: serde_json::to_string("").unwrap(),
}); });

View File

@ -151,8 +151,7 @@ pub(super) fn update(
*GLOBALS.settings.blocking_write() = app.settings.clone(); *GLOBALS.settings.blocking_write() = app.settings.clone();
// Tell the overlord to save them // Tell the overlord to save them
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
kind: "save_settings".to_string(), kind: "save_settings".to_string(),
json_payload: serde_json::to_string("").unwrap(), json_payload: serde_json::to_string("").unwrap(),
}); });

View File

@ -141,8 +141,7 @@ 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 _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
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(),
}); });
@ -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)); ui.add(TextEdit::singleline(&mut app.password).password(true));
}); });
if ui.button("Generate Now").clicked() { if ui.button("Generate Now").clicked() {
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
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(),
}); });
@ -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)); ui.add(TextEdit::singleline(&mut app.password).password(true));
}); });
if ui.button("import").clicked() { if ui.button("import").clicked() {
let tx = GLOBALS.to_overlord.clone(); let _ = GLOBALS.to_overlord.send(ToOverlordMessage {
let _ = tx.send(ToOverlordMessage {
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(),
}); });