diff --git a/src/lysand/conversion.rs b/src/lysand/conversion.rs index 3e21cc9..f5ea97e 100644 --- a/src/lysand/conversion.rs +++ b/src/lysand/conversion.rs @@ -53,7 +53,9 @@ pub async fn db_post_from_url(url: Url) -> anyhow::Result } pub async fn db_user_from_url(url: Url) -> anyhow::Result { - if !url.domain().eq(&Some(LYSAND_DOMAIN.as_str())) && !url.domain().eq(&Some(API_DOMAIN.as_str())) { + if !url.domain().eq(&Some(LYSAND_DOMAIN.as_str())) + && !url.domain().eq(&Some(API_DOMAIN.as_str())) + { return Err(anyhow!("not lysands domain")); } let user_res: Option = prelude::User::find() diff --git a/src/lysand/http.rs b/src/lysand/http.rs index beed88a..4bf0d78 100644 --- a/src/lysand/http.rs +++ b/src/lysand/http.rs @@ -35,9 +35,7 @@ async fn fetch_post( Ok(HttpResponse::Ok() .content_type(FEDERATION_CONTENT_TYPE) - .json( - crate::objects::post::Note::from_db(&post) - )) + .json(crate::objects::post::Note::from_db(&post))) } #[get("/apbridge/create/{id}/{base64url}")] diff --git a/src/main.rs b/src/main.rs index 821aa9c..34d8096 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,6 @@ use lysand::http::{create_activity, fetch_post}; use objects::person::DbUser; use sea_orm::{ActiveModelTrait, DatabaseConnection, Set}; use serde::{Deserialize, Serialize}; -use utils::generate_object_id; use std::{ collections::HashMap, env, @@ -29,6 +28,7 @@ use std::{ use tokio::signal; use tracing::{info, instrument::WithSubscriber}; use url::Url; +use utils::generate_object_id; use crate::{ activities::create_post::CreatePost,