From 3fdb1c5bf3fd21077e6cbd294235b0de5cddd12c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 15 Oct 2019 15:10:42 -0700 Subject: [PATCH] Running cargo fmt. --- server/src/api/user.rs | 28 ++++++++++++++++++++++-- server/src/schema.rs | 48 +++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/server/src/api/user.rs b/server/src/api/user.rs index 2fc0a92ca..b0ed5a4bb 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -602,7 +602,17 @@ impl Perform for Oper { let user_id = claims.id; // Comments - let comments = CommentView::list(&conn, &SortType::New, None, Some(user_id), None, None, false, None, Some(std::i64::MAX))?; + let comments = CommentView::list( + &conn, + &SortType::New, + None, + Some(user_id), + None, + None, + false, + None, + Some(std::i64::MAX), + )?; for comment in &comments { let comment_form = CommentForm { @@ -623,7 +633,21 @@ impl Perform for Oper { } // Posts - let posts = PostView::list(&conn, PostListingType::All, &SortType::New,None, Some(user_id), None, None, None, true, false, false, None, Some(std::i64::MAX))?; + let posts = PostView::list( + &conn, + PostListingType::All, + &SortType::New, + None, + Some(user_id), + None, + None, + None, + true, + false, + false, + None, + Some(std::i64::MAX), + )?; for post in &posts { let post_form = PostForm { diff --git a/server/src/schema.rs b/server/src/schema.rs index ff56467ba..b4e16d136 100644 --- a/server/src/schema.rs +++ b/server/src/schema.rs @@ -305,28 +305,28 @@ joinable!(site -> user_ (creator_id)); joinable!(user_ban -> user_ (user_id)); allow_tables_to_appear_in_same_query!( - category, - comment, - comment_like, - comment_saved, - community, - community_follower, - community_moderator, - community_user_ban, - mod_add, - mod_add_community, - mod_ban, - mod_ban_from_community, - mod_lock_post, - mod_remove_comment, - mod_remove_community, - mod_remove_post, - mod_sticky_post, - post, - post_like, - post_read, - post_saved, - site, - user_, - user_ban, + category, + comment, + comment_like, + comment_saved, + community, + community_follower, + community_moderator, + community_user_ban, + mod_add, + mod_add_community, + mod_ban, + mod_ban_from_community, + mod_lock_post, + mod_remove_comment, + mod_remove_community, + mod_remove_post, + mod_sticky_post, + post, + post_like, + post_read, + post_saved, + site, + user_, + user_ban, );