Forgot to type a few Searches. Fixes #718 (#722)

diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx
index b6b0567b7c2778d8e973f2871da6f36c7a1ca2fe..1306caec10f09842acd91b68728030ac13a82e01 100644 (file)
--- 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 1b632e3949428625f7be49b24f320a7e2002543b..a91162177ef8d147fbdc27e397651cbeac6b783c 100644 (file)
--- 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);
 }