From c2c98ac63885a0ef4f062066154c390f32045199 Mon Sep 17 00:00:00 2001 From: Dessalines <dessalines@users.noreply.github.com> Date: Mon, 18 Jul 2022 15:58:37 -0400 Subject: [PATCH] Forgot to type a few Searches. Fixes #718 (#722) --- src/shared/components/search.tsx | 14 +++++++++----- src/shared/utils.ts | 12 ++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx index b6b0567..1306cae 100644 --- a/src/shared/components/search.tsx +++ b/src/shared/components/search.tsx @@ -200,9 +200,15 @@ export class Search extends Component<any, SearchState> { ); // This can be single or multiple communities given - this.state.communities = communitiesRes - .map(c => c.communities) - .unwrapOr([communityRes.map(c => c.community_view).unwrap()]); + communitiesRes.match({ + some: res => (this.state.communities = res.communities), + none: void 0, + }); + + communityRes.match({ + some: res => (this.state.communities = [res.community_view]), + none: void 0, + }); this.state.creatorDetails = Some( this.isoData.routeData[2] as GetPersonDetailsResponse @@ -819,8 +825,6 @@ export class Search extends Component<any, SearchState> { let creator_id: Option<number> = this.state.creatorId == 0 ? None : Some(this.state.creatorId); - console.log(community_id.unwrapOr(-22)); - let form = new SearchForm({ q: this.state.q, community_id, diff --git a/src/shared/utils.ts b/src/shared/utils.ts index 1b632e3..a911621 100644 --- a/src/shared/utils.ts +++ b/src/shared/utils.ts @@ -365,9 +365,9 @@ export function routeSearchTypeToEnum(type: string): SearchType { } export async function getSiteMetadata(url: string) { - let form: GetSiteMetadata = { + let form = new GetSiteMetadata({ url, - }; + }); let client = new LemmyHttp(httpBase); return client.getSiteMetadata(form); } @@ -1314,7 +1314,7 @@ export function personToChoice(pvs: PersonViewSafe): ChoicesValue { } export async function fetchCommunities(q: string) { - let form: Search = { + let form = new Search({ q, type_: Some(SearchType.Communities), sort: Some(SortType.TopAll), @@ -1325,13 +1325,13 @@ export async function fetchCommunities(q: string) { community_name: None, creator_id: None, auth: auth(false).ok(), - }; + }); let client = new LemmyHttp(httpBase); return client.search(form); } export async function fetchUsers(q: string) { - let form: Search = { + let form = new Search({ q, type_: Some(SearchType.Users), sort: Some(SortType.TopAll), @@ -1342,7 +1342,7 @@ export async function fetchUsers(q: string) { community_name: None, creator_id: None, auth: auth(false).ok(), - }; + }); let client = new LemmyHttp(httpBase); return client.search(form); } -- 2.44.1