diff options
Diffstat (limited to 'src/api/shiggy.rs')
| -rw-r--r-- | src/api/shiggy.rs | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/api/shiggy.rs b/src/api/shiggy.rs index b1d4a87..d6a6238 100644 --- a/src/api/shiggy.rs +++ b/src/api/shiggy.rs @@ -1,8 +1,5 @@ -use crate::api::REQWEST_CLIENT; - -use eyre::{eyre, Result}; +use eyre::Result; use log::debug; -use reqwest::StatusCode; use serde::Deserialize; const SHIGGY: &str = "https://safebooru.donmai.us"; @@ -14,19 +11,10 @@ struct SafebooruResponse { } #[allow(clippy::module_name_repetitions)] -pub async fn get_random_shiggy() -> Result<String> { - let req = REQWEST_CLIENT - .get(format!("{SHIGGY}{RANDOM_SHIGGY}")) - .build()?; - - debug!("Making request to {}", req.url()); - let resp = REQWEST_CLIENT.execute(req).await?; - let status = resp.status(); +pub async fn random_shiggy() -> Result<String> { + let url = format!("{SHIGGY}{RANDOM_SHIGGY}"); + debug!("Making request to {url}"); - if let StatusCode::OK = status { - let data: SafebooruResponse = resp.json().await?; - Ok(data.file_url) - } else { - Err(eyre!("Failed to get random shiggy with {status}")) - } + let resp: SafebooruResponse = super::get_json(&url).await?; + Ok(resp.file_url) } |
