diff --git a/web/src/api.rs b/web/src/api.rs index 5fb115e..def0045 100644 --- a/web/src/api.rs +++ b/web/src/api.rs @@ -1,7 +1,6 @@ use log::info; use notmuch::ThreadSet; use seed::{prelude::*, Url}; -use serde::de::Deserialize; const BASE_URL: &str = "/api"; pub fn refresh() -> String { @@ -11,9 +10,6 @@ pub fn search(query: &str, page: usize, results_per_page: usize) -> String { let query = Url::encode_uri_component(query); format!("{BASE_URL}/search/{query}?page={page}&results_per_page={results_per_page}") } -pub fn show(tid: &str) -> String { - format!("{BASE_URL}/show/{tid}") -} pub fn show_pretty(tid: &str) -> String { format!("{BASE_URL}/show/{tid}/pretty") } @@ -61,20 +57,6 @@ pub async fn refresh_request() -> fetch::Result<()> { Ok(()) } -pub async fn show_request(tid: &str) -> fetch::Result { - let b = Request::new(show(tid)) - .method(Method::Get) - .fetch() - .await? - .check_status()? - .bytes() - .await?; - let mut deserializer = serde_json::Deserializer::from_slice(&b); - deserializer.disable_recursion_limit(); - Ok(ThreadSet::deserialize(&mut deserializer) - .map_err(|_| FetchError::JsonError(fetch::JsonError::Serde(JsValue::NULL)))?) -} - pub async fn show_pretty_request(tid: &str) -> fetch::Result { Request::new(show_pretty(tid)) .method(Method::Get) diff --git a/web/src/state.rs b/web/src/state.rs index e8fb156..0fd2558 100644 --- a/web/src/state.rs +++ b/web/src/state.rs @@ -147,19 +147,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) { error!("fetch failed {:?}", fetch_error); } - Msg::ShowRequest(tid) => { - orders - .skip() - .perform_cmd(async move { Msg::ShowResult(api::show_request(&tid).await) }); - } - Msg::ShowResult(Ok(response_data)) => { - debug!("fetch ok {:#?}", response_data); - model.context = Context::Thread(response_data); - } - Msg::ShowResult(Err(fetch_error)) => { - error!("fetch failed {:?}", fetch_error); - } - Msg::ShowPrettyRequest(tid) => { orders.skip().perform_cmd(async move { Msg::ShowPrettyResult(api::show_pretty_request(&tid).await) @@ -327,6 +314,7 @@ pub struct Model { } #[derive(Error, Debug)] +#[allow(dead_code)] // Remove once the UI is showing errors pub enum UIError { #[error("No error, this should never be presented to user")] NoError, @@ -378,8 +366,6 @@ pub enum Msg { results_per_page: usize, }, SearchResult(fetch::Result), - ShowRequest(String), - ShowResult(fetch::Result), ShowPrettyRequest(String), ShowPrettyResult(fetch::Result), NextPage,