From 32d93ff87844df58f4c565b52124c6baffa8e482 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Sun, 10 Dec 2023 01:29:43 -0500 Subject: [PATCH] api error message optional --- src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 6d0aa89..a036a05 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -160,7 +160,7 @@ impl Forgejo { }, status if status.is_client_error() => Err(ForgejoError::ApiError( status, - response.json::().await?.message, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), )), status => Err(ForgejoError::UnexpectedStatusCode(status)), } @@ -173,7 +173,7 @@ impl Forgejo { status if status.is_success() => Ok(response.text().await?), status if status.is_client_error() => Err(ForgejoError::ApiError( status, - response.json::().await?.message, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), )), status => Err(ForgejoError::UnexpectedStatusCode(status)), } @@ -194,7 +194,7 @@ impl Forgejo { StatusCode::NOT_FOUND => Ok(None), status if status.is_client_error() => Err(ForgejoError::ApiError( status, - response.json::().await?.message, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), )), status => Err(ForgejoError::UnexpectedStatusCode(status)), } @@ -203,7 +203,7 @@ impl Forgejo { #[derive(serde::Deserialize)] struct ErrorMessage { - message: String, + message: Option, // intentionally ignored, no need for now // url: Url }