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/site.rs | |
| parent | 0ceed8fd9bd204533dacf3b79be1e0d97f33ed3e (diff) | |
Use a dedicated structure in order to search posts
Diffstat (limited to 'server/src/api/site.rs')
| -rw-r--r-- | server/src/api/site.rs | 64 |
1 files changed, 19 insertions, 45 deletions
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()?; } }; |