make it possible to return responses as the 'body'

crates/kitsune-error/Cargo.toml

@@ -11,6 +11,7 @@ eyre = "0.6.12"
 garde = { version = "0.18.0", default-features = false, features = ["serde"] }
 http = "1.1.0"
 simd-json = "0.13.9"
+sync_wrapper = "1.0.0"
 tracing = "0.1.40"
 
 [lints]

crates/kitsune-error/src/axum.rs

@@ -33,15 +33,16 @@ impl IntoResponse for Error {
             return to_response(StatusCode::BAD_REQUEST, Some(body));
         }
 
+        let maybe_body = self.ctx.body.into_inner();
         match self.ctx.ty {
-            ErrorType::BadRequest => to_response(StatusCode::BAD_REQUEST, self.ctx.body),
-            ErrorType::Forbidden => to_response(StatusCode::FORBIDDEN, self.ctx.body),
-            ErrorType::NotFound => to_response(StatusCode::NOT_FOUND, self.ctx.body),
-            ErrorType::Unauthorized => to_response(StatusCode::UNAUTHORIZED, self.ctx.body),
+            ErrorType::BadRequest => to_response(StatusCode::BAD_REQUEST, maybe_body),
+            ErrorType::Forbidden => to_response(StatusCode::FORBIDDEN, maybe_body),
+            ErrorType::NotFound => to_response(StatusCode::NOT_FOUND, maybe_body),
+            ErrorType::Unauthorized => to_response(StatusCode::UNAUTHORIZED, maybe_body),
             ErrorType::UnsupportedMediaType => {
-                to_response(StatusCode::UNSUPPORTED_MEDIA_TYPE, self.ctx.body)
+                to_response(StatusCode::UNSUPPORTED_MEDIA_TYPE, maybe_body)
             }
-            ErrorType::Other => to_response(StatusCode::INTERNAL_SERVER_ERROR, self.ctx.body),
+            ErrorType::Other => to_response(StatusCode::INTERNAL_SERVER_ERROR, maybe_body),
         }
     }
 }

crates/kitsune-error/src/lib.rs

@@ -1,7 +1,9 @@
 #[macro_use]
 extern crate tracing;
 
+use axum_core::response::{IntoResponse, Response};
 use std::fmt::{self, Debug, Display};
+use sync_wrapper::SyncWrapper;
 
 pub use self::ext::ResultExt;
 
@@ -40,14 +42,13 @@ pub enum ErrorType {
 
 impl ErrorType {
     #[must_use]
-    #[allow(clippy::needless_pass_by_value)]
     pub fn with_body<B>(self, body: B) -> ErrorContext
     where
-        B: ToString,
+        B: IntoResponse,
     {
         ErrorContext {
             ty: self,
-            body: Some(body.to_string()),
+            body: Some(body.into_response()).into(),
         }
     }
 }
@@ -56,15 +57,15 @@ impl From<ErrorType> for ErrorContext {
     fn from(value: ErrorType) -> Self {
         Self {
             ty: value,
-            body: None,
+            body: SyncWrapper::new(None),
         }
     }
 }
 
 #[derive(Debug)]
 pub struct ErrorContext {
     ty: ErrorType,
-    body: Option<String>,
+    body: SyncWrapper<Option<Response>>,
 }
 
 #[derive(Debug)]

kitsune/src/http/handler/mastodon/api/v1/accounts/update_credentials.rs

@@ -77,7 +77,7 @@ pub async fn patch(
 
     let update = update.build().map_err(|err| {
         kitsune_error!(
-            type = ErrorType::BadRequest.with_body(err),
+            type = ErrorType::BadRequest.with_body(err.to_string()),
             "missing upload field"
         )
     })?;

kitsune/src/http/handler/mastodon/api/v1/media.rs

@@ -89,7 +89,7 @@ pub async fn post(
 
     let upload = upload.build().map_err(|err| {
         kitsune_error!(
-            type = ErrorType::BadRequest.with_body(err),
+            type = ErrorType::BadRequest.with_body(err.to_string()),
             "not all fields were filled"
         )
     })?;