From 3a7af37527c7752b42d518ec719a479254d6ba96 Mon Sep 17 00:00:00 2001
From: Vika <vika@fireburn.ru>
Date: Sun, 10 Jul 2022 14:52:43 +0300
Subject: micropub: move MicropubError into kittybox-util

Looks like this shared data structure will be useful to me later when
splitting off the media endpoint into its own crate.
---
 kittybox-rs/src/media/mod.rs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'kittybox-rs/src/media')

diff --git a/kittybox-rs/src/media/mod.rs b/kittybox-rs/src/media/mod.rs
index e9e91ac..4a253d0 100644
--- a/kittybox-rs/src/media/mod.rs
+++ b/kittybox-rs/src/media/mod.rs
@@ -2,20 +2,13 @@ use axum::{
     extract::{Extension, Host, multipart::{Multipart, MultipartError}, Path},
     response::{IntoResponse, Response}, headers::HeaderValue,
 };
-use crate::{micropub::{MicropubError, ErrorType}, tokenauth::User};
+use kittybox_util::error::{MicropubError, ErrorType};
+use crate::tokenauth::User;
 
 pub mod storage;
 use storage::{MediaStore, MediaStoreError, Metadata, ErrorKind};
 pub use storage::file::FileStore;
 
-impl From<MultipartError> for MicropubError {
-    fn from(err: MultipartError) -> Self {
-        Self {
-            error: ErrorType::InvalidRequest,
-            error_description: format!("multipart/form-data error: {}", err)
-        }
-    }
-}
 impl From<MediaStoreError> for MicropubError {
     fn from(err: MediaStoreError) -> Self {
         Self {
@@ -47,7 +40,10 @@ pub async fn upload<S: MediaStore>(
             }.into_response();
         },
         Err(err) => {
-            return MicropubError::from(err).into_response();
+            return MicropubError {
+                error: ErrorType::InternalServerError,
+                error_description: format!("Error while parsing multipart/form-data: {}", err)
+            }.into_response();
         },
     };
     let metadata: Metadata = (&field).into();
-- 
cgit 1.4.1