diff options
author | Lyra <teromene@teromene.fr> | 2019-12-07 13:03:03 +0100 |
---|---|---|
committer | Lyra <teromene@teromene.fr> | 2019-12-07 13:03:03 +0100 |
commit | bff3183a2701257ce085a76d9d5d327f80ccec37 (patch) | |
tree | bd2a86ad62af866a8b0fe89f4bcc278f6e05d37e /server/src/api | |
parent | 0ceed8fd9bd204533dacf3b79be1e0d97f33ed3e (diff) |
Use a dedicated structure in order to search posts
Diffstat (limited to 'server/src/api')
-rw-r--r-- | server/src/api/post.rs | 22 | ||||
-rw-r--r-- | server/src/api/site.rs | 64 | ||||
-rw-r--r-- | server/src/api/user.rs | 71 |
3 files changed, 49 insertions, 108 deletions
diff --git a/server/src/api/post.rs b/server/src/api/post.rs index 5df42990..e507aba3 100644 --- a/server/src/api/post.rs +++ b/server/src/api/post.rs @@ -238,21 +238,13 @@ impl Perform<GetPostsResponse> for Oper<GetPosts> { let type_ = ListingType::from_str(&data.type_)?; let sort = SortType::from_str(&data.sort)?; - let posts = match PostView::list( - &conn, - type_, - &sort, - data.community_id, - None, - None, - None, - user_id, - show_nsfw, - false, - false, - data.page, - data.limit, - ) { + let posts = match PostViewQuery::create(&conn, type_, &sort, show_nsfw, false, false) + .for_community_id_optional(data.community_id) + .my_user_id_optional(user_id) + .page_optional(data.page) + .limit_optional(data.limit) + .list() + { Ok(posts) => posts, Err(_e) => return Err(APIError::err(&self.op, "couldnt_get_posts"))?, }; diff --git a/server/src/api/site.rs b/server/src/api/site.rs index 618295fc..8ed5fc25 100644 --- a/server/src/api/site.rs +++ b/server/src/api/site.rs @@ -319,21 +319,12 @@ impl Perform<SearchResponse> for Oper<Search> { match type_ { SearchType::Posts => { - posts = PostView::list( - &conn, - ListingType::All, - &sort, - data.community_id, - None, - Some(data.q.to_owned()), - None, - None, - true, - false, - false, - data.page, - data.limit, - )?; + posts = PostViewQuery::create(&conn, ListingType::All, &sort, true, false, false) + .for_community_id_optional(data.community_id) + .search_term(data.q.to_owned()) + .page_optional(data.page) + .limit_optional(data.limit) + .list()?; } SearchType::Comments => { comments = CommentView::list( @@ -363,21 +354,13 @@ impl Perform<SearchResponse> for Oper<Search> { users = UserView::list(&conn, &sort, Some(data.q.to_owned()), data.page, data.limit)?; } SearchType::All => { - posts = PostView::list( - &conn, - ListingType::All, - &sort, - data.community_id, - None, - Some(data.q.to_owned()), - None, - None, - true, - false, - false, - data.page, - data.limit, - )?; + posts = PostViewQuery::create(&conn, ListingType::All, &sort, true, false, false) + .for_community_id_optional(data.community_id) + .search_term(data.q.to_owned()) + .page_optional(data.page) + .limit_optional(data.limit) + .list()?; + comments = CommentView::list( &conn, &sort, @@ -401,21 +384,12 @@ impl Perform<SearchResponse> for Oper<Search> { users = UserView::list(&conn, &sort, Some(data.q.to_owned()), data.page, data.limit)?; } SearchType::Url => { - posts = PostView::list( - &conn, - ListingType::All, - &sort, - data.community_id, - None, - None, - Some(data.q.to_owned()), - None, - true, - false, - false, - data.page, - data.limit, - )?; + posts = PostViewQuery::create(&conn, ListingType::All, &sort, true, false, false) + .for_community_id_optional(data.community_id) + .url_search(data.q.to_owned()) + .page_optional(data.page) + .limit_optional(data.limit) + .list()?; } }; diff --git a/server/src/api/user.rs b/server/src/api/user.rs index e15563b0..da077254 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -366,40 +366,26 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> { let user_view = UserView::read(&conn, user_details_id)?; + let mut posts_query = PostViewQuery::create( + &conn, + ListingType::All, + &sort, + show_nsfw, + data.saved_only, + false, + ) + .for_community_id_optional(data.community_id) + .my_user_id_optional(user_id) + .page_optional(data.page) + .limit_optional(data.limit); + // If its saved only, you don't care what creator it was - let posts = if data.saved_only { - PostView::list( - &conn, - ListingType::All, - &sort, - data.community_id, - None, - None, - None, - Some(user_details_id), - show_nsfw, - data.saved_only, - false, - data.page, - data.limit, - )? - } else { - PostView::list( - &conn, - ListingType::All, - &sort, - data.community_id, - Some(user_details_id), - None, - None, - user_id, - show_nsfw, - data.saved_only, - false, - data.page, - data.limit, - )? - }; + if !data.saved_only { + posts_query = posts_query.for_creator_id(user_details_id); + } + + let posts = posts_query.list()?; + let comments = if data.saved_only { CommentView::list( &conn, @@ -777,21 +763,10 @@ impl Perform<LoginResponse> for Oper<DeleteAccount> { } // Posts - let posts = PostView::list( - &conn, - ListingType::All, - &SortType::New, - None, - Some(user_id), - None, - None, - None, - true, - false, - false, - None, - Some(std::i64::MAX), - )?; + let posts = PostViewQuery::create(&conn, ListingType::All, &SortType::New, true, false, false) + .for_creator_id(user_id) + .limit(std::i64::MAX) + .list()?; for post in &posts { let post_form = PostForm { |