Follow Rust and crates update

This commit is contained in:
Kitaiti Makoto
2021-11-28 07:53:13 +09:00
parent 9187e4dde9
commit ae3344f318
35 changed files with 208 additions and 160 deletions
-6
View File
@@ -19,12 +19,6 @@ impl From<Error> for ApiError {
}
}
impl From<std::option::NoneError> for ApiError {
fn from(err: std::option::NoneError) -> ApiError {
ApiError(err.into())
}
}
impl<'r> Responder<'r> for ApiError {
fn respond_to(self, req: &Request<'_>) -> response::Result<'r> {
match self.0 {
+12 -9
View File
@@ -1,7 +1,7 @@
use chrono::NaiveDateTime;
use rocket_contrib::json::Json;
use crate::api::{authorization::*, Api};
use crate::api::{authorization::*, Api, ApiError};
use plume_api::posts::*;
use plume_common::{activity_pub::broadcast, utils::md_to_html};
use plume_models::{
@@ -121,14 +121,17 @@ pub fn create(
Some(Media::get_media_processor(&conn, vec![&author])),
);
let blog = payload.blog_id.or_else(|| {
let blogs = Blog::find_for_author(&conn, &author).ok()?;
if blogs.len() == 1 {
Some(blogs[0].id)
} else {
None
}
})?;
let blog = payload
.blog_id
.or_else(|| {
let blogs = Blog::find_for_author(&conn, &author).ok()?;
if blogs.len() == 1 {
Some(blogs[0].id)
} else {
None
}
})
.ok_or(ApiError(Error::NotFound))?;
if Post::find_by_slug(&conn, slug, blog).is_ok() {
return Err(Error::InvalidValue.into());