From a42ac3e58adcae58cf07cd6bd3abf33adbc5c965 Mon Sep 17 00:00:00 2001 From: Dessalines <tyhou13@gmx.com> Date: Fri, 9 Apr 2021 16:09:58 -0400 Subject: [PATCH] Add creator id to search. Fixes #765 --- crates/api/src/site.rs | 11 +++++++++++ crates/api_common/src/site.rs | 1 + 2 files changed, 12 insertions(+) diff --git a/crates/api/src/site.rs b/crates/api/src/site.rs index aae400ca..a6f09f59 100644 --- a/crates/api/src/site.rs +++ b/crates/api/src/site.rs @@ -159,6 +159,8 @@ impl Perform for Search { let sort = SortType::from_str(&data.sort)?; let community_id = data.community_id; let community_name = data.community_name.to_owned(); + let community_name_2 = data.community_name.to_owned(); + let creator_id = data.creator_id; match type_ { SearchType::Posts => { posts = blocking(context.pool(), move |conn| { @@ -168,6 +170,7 @@ impl Perform for Search { .show_bot_accounts(show_bot_accounts) .community_id(community_id) .community_name(community_name) + .creator_id(creator_id) .my_person_id(person_id) .search_term(q) .page(page) @@ -182,6 +185,9 @@ impl Perform for Search { .sort(&sort) .search_term(q) .show_bot_accounts(show_bot_accounts) + .community_id(community_id) + .community_name(community_name) + .creator_id(creator_id) .my_person_id(person_id) .page(page) .limit(limit) @@ -220,6 +226,7 @@ impl Perform for Search { .show_bot_accounts(show_bot_accounts) .community_id(community_id) .community_name(community_name) + .creator_id(creator_id) .my_person_id(person_id) .search_term(q) .page(page) @@ -236,6 +243,9 @@ impl Perform for Search { .sort(&sort) .search_term(q) .show_bot_accounts(show_bot_accounts) + .community_id(community_id) + .community_name(community_name_2) + .creator_id(creator_id) .my_person_id(person_id) .page(page) .limit(limit) @@ -279,6 +289,7 @@ impl Perform for Search { .my_person_id(person_id) .community_id(community_id) .community_name(community_name) + .creator_id(creator_id) .url_search(q) .page(page) .limit(limit) diff --git a/crates/api_common/src/site.rs b/crates/api_common/src/site.rs index ffee7ba8..6d3ebf63 100644 --- a/crates/api_common/src/site.rs +++ b/crates/api_common/src/site.rs @@ -25,6 +25,7 @@ pub struct Search { pub type_: String, pub community_id: Option<CommunityId>, pub community_name: Option<String>, + pub creator_id: Option<PersonId>, pub sort: String, pub page: Option<i64>, pub limit: Option<i64>, -- 2.44.1