From 4a639b3e53f670e36e2eb3e523a8a847a3d958ba Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 1 Jan 2024 10:26:47 +0000 Subject: [PATCH] Make the [ESC][Y] shortcut work. Useful to do this before I start filling in the rest of the Examine User display, so that it's quick to test it each time! --- src/client.rs | 4 ++++ src/menu.rs | 7 +++++-- src/tui.rs | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/client.rs b/src/client.rs index c80260e..f5c9695 100644 --- a/src/client.rs +++ b/src/client.rs @@ -174,6 +174,10 @@ impl Client { } } + pub fn our_account_id(&self) -> String { + self.auth.account_id.clone() + } + fn api_request_cl(&self, client: &reqwest::blocking::Client, req: Req) -> Result<(String, reqwest::blocking::RequestBuilder), ClientError> { diff --git a/src/menu.rs b/src/menu.rs index afbf1e9..4bc733f 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -214,18 +214,21 @@ pub fn main_menu() -> Box { Box::new(menu.finalise()) } -pub fn utils_menu() -> Box { +pub fn utils_menu(client: &Client) -> Box { let mut menu = Menu::new( ColouredString::general( "Utilities [ESC]", "HHHHHHHHHHHKKKH"), false); + let our_account_id = client.our_account_id(); + menu.add_action(Pr('R'), "Read Mentions", LogicalAction::Goto( UtilityActivity::ReadMentions.into())); menu.add_blank_line(); menu.add_action(Pr('E'), "Examine User", LogicalAction::Goto( OverlayActivity::GetUserToExamine.into())); - menu.add_action(Pr('Y'), "Examine Yourself", LogicalAction::NYI); + menu.add_action(Pr('Y'), "Examine Yourself", LogicalAction::Goto( + UtilityActivity::ExamineUser(our_account_id).into())); menu.add_blank_line(); menu.add_action(Pr('L'), "Logs menu", LogicalAction::Goto( UtilityActivity::LogsMenu1.into())); diff --git a/src/tui.rs b/src/tui.rs index c63c5b1..027d742 100644 --- a/src/tui.rs +++ b/src/tui.rs @@ -424,7 +424,7 @@ fn new_activity_state(activity: Activity, client: &mut Client) -> Activity::NonUtil(NonUtilityActivity::MainMenu) => Ok(main_menu()), Activity::Util(UtilityActivity::UtilsMenu) => - Ok(utils_menu()), + Ok(utils_menu(client)), Activity::Util(UtilityActivity::ExitMenu) => Ok(exit_menu()), Activity::Util(UtilityActivity::LogsMenu1) => -- 2.30.2