rahix/forgejo-api
1
0
Fork 0
Code Activity

api error message optional

Browse source
This commit is contained in:
Cyborus 2023-12-10 01:29:43 -05:00
parent 3c1675976c
commit 32d93ff878
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib.rs
View file

@ -160,7 +160,7 @@ impl Forgejo {
}, },
status if status.is_client_error() => Err(ForgejoError::ApiError( status if status.is_client_error() => Err(ForgejoError::ApiError(
status, status,
response.json::<ErrorMessage>().await?.message, response.json::<ErrorMessage>().await?.message.unwrap_or_else(|| String::from("[no message]")),
)), )),
status => Err(ForgejoError::UnexpectedStatusCode(status)), status => Err(ForgejoError::UnexpectedStatusCode(status)),
} }
@ -173,7 +173,7 @@ impl Forgejo {
status if status.is_success() => Ok(response.text().await?), status if status.is_success() => Ok(response.text().await?),
status if status.is_client_error() => Err(ForgejoError::ApiError( status if status.is_client_error() => Err(ForgejoError::ApiError(
status, status,
response.json::<ErrorMessage>().await?.message, response.json::<ErrorMessage>().await?.message.unwrap_or_else(|| String::from("[no message]")),
)), )),
status => Err(ForgejoError::UnexpectedStatusCode(status)), status => Err(ForgejoError::UnexpectedStatusCode(status)),
} }
@ -194,7 +194,7 @@ impl Forgejo {
StatusCode::NOT_FOUND => Ok(None), StatusCode::NOT_FOUND => Ok(None),
status if status.is_client_error() => Err(ForgejoError::ApiError( status if status.is_client_error() => Err(ForgejoError::ApiError(
status, status,
response.json::<ErrorMessage>().await?.message, response.json::<ErrorMessage>().await?.message.unwrap_or_else(|| String::from("[no message]")),
)), )),
status => Err(ForgejoError::UnexpectedStatusCode(status)), status => Err(ForgejoError::UnexpectedStatusCode(status)),
} }
@ -203,7 +203,7 @@ impl Forgejo {
#[derive(serde::Deserialize)] #[derive(serde::Deserialize)]
struct ErrorMessage { struct ErrorMessage {
message: String, message: Option<String>,
// intentionally ignored, no need for now // intentionally ignored, no need for now
// url: Url // url: Url
} }