From 1a78c48bd86ff72cc9c7020e69ec9a77302a2f8b Mon Sep 17 00:00:00 2001 From: Vika Date: Tue, 4 May 2021 21:14:31 +0300 Subject: Made StorageErrors directly convertible into Micropub JSON responses --- src/micropub/get.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/micropub/get.rs') diff --git a/src/micropub/get.rs b/src/micropub/get.rs index 9a12316..2b367fd 100644 --- a/src/micropub/get.rs +++ b/src/micropub/get.rs @@ -23,10 +23,7 @@ where let channels: Vec; match backend.get_channels(&user).await { Ok(chans) => channels = chans, - Err(err) => return Ok(Response::builder(500).body(json!({ - "error": "database_error", - "error_description": format!("Couldn't fetch channel list from the database: {:?}", err) - })).build()) + Err(err) => return Ok(err.into()) } Ok(Response::builder(200).body(json!({ "q": ["source", "config", "channel"], @@ -38,10 +35,7 @@ where let channels: Vec; match backend.get_channels(&user).await { Ok(chans) => channels = chans, - Err(err) => return Ok(Response::builder(500).body(json!({ - "error": "database_error", - "error_description": format!("Couldn't fetch channel list from the database: {:?}", err) - })).build()) + Err(err) => return Ok(err.into()) } return Ok(Response::builder(200).body(json!(channels)).build()) } @@ -54,10 +48,7 @@ where } else { return Ok(Response::builder(404).build()) }, - Err(err) => return Ok(Response::builder(500).body(json!({ - "error": "database_error", - "error_description": err - })).build()) + Err(err) => return Ok(err.into()) } } else { return Ok(Response::builder(400).body(json!({ -- cgit 1.4.1