diff --git a/plume-models/src/config.rs b/plume-models/src/config.rs index 87218057..3bd3623b 100644 --- a/plume-models/src/config.rs +++ b/plume-models/src/config.rs @@ -314,8 +314,7 @@ fn get_proxy_config() -> Option { } }) } else { - reqwest::Proxy::all(proxy_url) - .expect("Invalid PROXY_URL") + reqwest::Proxy::all(proxy_url).expect("Invalid PROXY_URL") }; Some(ProxyConfig { url, diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs index e60b4bd7..4e368f58 100644 --- a/plume-models/src/posts.rs +++ b/plume-models/src/posts.rs @@ -287,15 +287,15 @@ impl Post { pub fn get_receivers_urls(&self, conn: &Connection) -> Result> { Ok(self - .get_authors(conn)? - .into_iter() - .filter_map(|a| a.get_followers(conn).ok()) - .fold(vec![], |mut acc, f| { - for x in f { - acc.push(x.ap_url); - } - acc - })) + .get_authors(conn)? + .into_iter() + .filter_map(|a| a.get_followers(conn).ok()) + .fold(vec![], |mut acc, f| { + for x in f { + acc.push(x.ap_url); + } + acc + })) } pub fn to_activity(&self, conn: &Connection) -> Result { diff --git a/src/routes/comments.rs b/src/routes/comments.rs index c2d05f36..6110bf02 100644 --- a/src/routes/comments.rs +++ b/src/routes/comments.rs @@ -91,9 +91,11 @@ pub fn create( }); Flash::success( - Redirect::to( - uri!(super::posts::details: blog = blog_name, slug = slug, responding_to = _), - ), + Redirect::to(uri!( + super::posts::details: blog = blog_name, + slug = slug, + responding_to = _ + )), i18n!(&rockets.intl.catalog, "Your comment has been posted."), ) }) @@ -168,7 +170,11 @@ pub fn delete( } } Ok(Flash::success( - Redirect::to(uri!(super::posts::details: blog = blog, slug = slug, responding_to = _)), + Redirect::to(uri!( + super::posts::details: blog = blog, + slug = slug, + responding_to = _ + )), i18n!(&rockets.intl.catalog, "Your comment has been deleted."), )) } diff --git a/src/routes/instance.rs b/src/routes/instance.rs index 407c5fb1..83bc46b6 100644 --- a/src/routes/instance.rs +++ b/src/routes/instance.rs @@ -408,9 +408,14 @@ pub fn interact(rockets: PlumeRocket, user: Option, target: String) -> Opt } if let Ok(post) = Post::from_id(&rockets, &target, None, CONFIG.proxy()) { - return Some(Redirect::to( - uri!(super::posts::details: blog = post.get_blog(&rockets.conn).expect("Can't retrieve blog").fqn, slug = &post.slug, responding_to = _), - )); + return Some(Redirect::to(uri!( + super::posts::details: blog = post + .get_blog(&rockets.conn) + .expect("Can't retrieve blog") + .fqn, + slug = &post.slug, + responding_to = _ + ))); } if let Ok(comment) = Comment::from_id(&rockets, &target, None, CONFIG.proxy()) { diff --git a/src/routes/likes.rs b/src/routes/likes.rs index 9dcc068e..f62aede4 100644 --- a/src/routes/likes.rs +++ b/src/routes/likes.rs @@ -45,9 +45,11 @@ pub fn create( .execute(move || broadcast(&user, delete_act, dest, CONFIG.proxy().cloned())); } - Ok(Redirect::to( - uri!(super::posts::details: blog = blog, slug = slug, responding_to = _), - )) + Ok(Redirect::to(uri!( + super::posts::details: blog = blog, + slug = slug, + responding_to = _ + ))) } #[post("/~///like", rank = 2)] diff --git a/src/routes/posts.rs b/src/routes/posts.rs index 654824ec..b04fa4fc 100644 --- a/src/routes/posts.rs +++ b/src/routes/posts.rs @@ -356,7 +356,11 @@ pub fn update( } Flash::success( - Redirect::to(uri!(details: blog = blog, slug = new_slug, responding_to = _)), + Redirect::to(uri!( + details: blog = blog, + slug = new_slug, + responding_to = _ + )), i18n!(intl, "Your article has been updated."), ) .into() @@ -543,7 +547,11 @@ pub fn create( } Ok(Flash::success( - Redirect::to(uri!(details: blog = blog_name, slug = slug, responding_to = _)), + Redirect::to(uri!( + details: blog = blog_name, + slug = slug, + responding_to = _ + )), i18n!(&rockets.intl.catalog, "Your article has been saved."), ) .into()) @@ -583,7 +591,11 @@ pub fn delete( .any(|a| a.id == user.id) { return Ok(Flash::error( - Redirect::to(uri!(details: blog = blog_name, slug = slug, responding_to = _)), + Redirect::to(uri!( + details: blog = blog_name, + slug = slug, + responding_to = _ + )), i18n!(intl.catalog, "You are not allowed to delete this article."), )); } diff --git a/src/routes/reshares.rs b/src/routes/reshares.rs index 788f9b9c..0f334268 100644 --- a/src/routes/reshares.rs +++ b/src/routes/reshares.rs @@ -45,9 +45,11 @@ pub fn create( .execute(move || broadcast(&user, delete_act, dest, CONFIG.proxy().cloned())); } - Ok(Redirect::to( - uri!(super::posts::details: blog = blog, slug = slug, responding_to = _), - )) + Ok(Redirect::to(uri!( + super::posts::details: blog = blog, + slug = slug, + responding_to = _ + ))) } #[post("/~///reshare", rank = 1)] diff --git a/src/routes/search.rs b/src/routes/search.rs index 7eabc6f7..5f4e2d42 100644 --- a/src/routes/search.rs +++ b/src/routes/search.rs @@ -55,8 +55,7 @@ pub fn search(query: Option>, rockets: PlumeRocket) -> Ructe { let query = query.map(Form::into_inner).unwrap_or_default(); let page = query.page.unwrap_or_default(); let mut parsed_query = - Query::from_str(&query.q.as_deref().unwrap_or_default()) - .unwrap_or_default(); + Query::from_str(&query.q.as_deref().unwrap_or_default()).unwrap_or_default(); param_to_query!(query, parsed_query; normal: title, subtitle, content, tag, instance, author, blog, lang, license; diff --git a/src/routes/session.rs b/src/routes/session.rs index 86955f9a..ab854cb8 100644 --- a/src/routes/session.rs +++ b/src/routes/session.rs @@ -210,9 +210,7 @@ pub fn password_reset( .map_err(|err| password_reset_error_response(err, &rockets))?; Ok(Flash::success( - Redirect::to(uri!( - new: m = _ - )), + Redirect::to(uri!(new: m = _)), i18n!( rockets.intl.catalog, "Your password was successfully reset."