Merge pull request #214 from hyperspacedev/develop-1.1.3-fix-search

v1.1.3 - Fix search page results

package.json

@@ -1,7 +1,7 @@
 {
     "name": "hyperspace",
     "productName": "Hyperspace Desktop",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "description": "A beautiful, fluffy client for the fediverse",
     "author": "Marquis Kurt <hyperspacedev@marquiskurt.net>",
     "repository": "https://github.com/hyperspacedev/hyperspace.git",
@@ -19,14 +19,14 @@
         "@types/react-router-dom": "^4.3.5",
         "@types/react-swipeable-views": "latest",
         "axios": "^0.19.2",
-        "electron": "^9.0.4",
+        "electron": "^9.0.5",
         "electron-builder": "^22.7.0",
         "emoji-mart": "^2.11.2",
         "file-dialog": "^0.0.7",
         "material-ui-pickers": "^2.2.4",
         "mdi-material-ui": "^5.27.0",
         "megalodon": "^0.6.4",
-        "moment": "^2.26.0",
+        "moment": "^2.27.0",
         "notistack": "^0.5.1",
         "prettier": "^1.19.1",
         "query-string": "^6.13.1",

public/config.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.1.2",
+    "version": "1.1.3",
     "location": "https://hyperspaceapp.herokuapp.com",
     "branding": {
         "name": "Hyperspace",

src/components/AppLayout/AppLayout.tsx

@@ -62,7 +62,8 @@ import { getConfig, getUserDefaultBool } from "../../utilities/settings";
 import {
     isDesktopApp,
     isDarwinApp,
-    getElectronApp
+    getElectronApp,
+    linkablePath
 } from "../../utilities/desktop";
 import { Config } from "../../types/Config";
 import {
@@ -326,9 +327,10 @@ export class AppLayout extends Component<any, IAppLayoutState> {
     searchForQuery(what: string) {
         what = what.replace(/^#/g, "tag:");
         // console.log(what);
-        window.location.href = isDesktopApp()
-            ? "hyperspace://hyperspace/app/index.html#/search?query=" + what
-            : "/#/search?query=" + what;
+        window.location.href = linkablePath("/#/search?query=" + what);
+        // window.location.href = isDesktopApp()
+        //     ? "hyperspace://hyperspace/app/index.html#/search?query=" + what
+        //     : "/#/search?query=" + what;
     }
 
     /**

src/pages/Search.tsx

@@ -19,7 +19,7 @@ import PersonAddIcon from "@material-ui/icons/PersonAdd";
 import { styles } from "./PageLayout.styles";
 import { LinkableIconButton, LinkableAvatar } from "../interfaces/overrides";
 import Mastodon from "megalodon";
-import { parse as parseParams, ParsedQuery } from "query-string";
+import { parse as parseParams } from "query-string";
 import { Results } from "../types/Search";
 import { withSnackbar } from "notistack";
 import Post from "../components/Post";
@@ -84,35 +84,23 @@ class SearchPage extends Component<any, ISearchPageState> {
         }
     }
 
-    runQueryCheck(newLocation?: string): ParsedQuery {
-        let searchParams = "";
-        if (newLocation !== undefined && typeof newLocation === "string") {
-            searchParams = newLocation.replace("#/search", "");
-        } else {
-            searchParams = this.props.location.hash.replace("#/search", "");
-        }
-        return parseParams(searchParams);
-    }
-
     getQueryAndType(props: any) {
-        let newSearch = this.runQueryCheck(props.location);
-        let query: string | string[];
+        const { search }: { search: string } = props.location;
+        let newSearch = parseParams(search);
+        let query: string | string[] = "";
         let type;
 
         if (newSearch.query) {
-            if (newSearch.query.toString().startsWith("tag:")) {
+            if (search.includes("tag:")) {
                 type = "tag";
-                query = newSearch.query.toString().replace("tag:", "");
-            } else {
-                query = newSearch.query;
             }
-        } else {
-            query = "";
+            query = newSearch.query.toString().replace("tag:", "");
         }
 
         if (newSearch.type && newSearch.type !== undefined) {
             type = newSearch.type;
         }
+
         return {
             query: query,
             type: type
@@ -155,14 +143,11 @@ class SearchPage extends Component<any, ISearchPageState> {
                 let tagResults: [Status] = resp.data;
                 this.setState({
                     tagResults,
-                    viewDidLoad: true,
-                    viewIsLoading: false
+                    viewDidLoad: true
                 });
-                // console.log(this.state.tagResults);
             })
             .catch((err: Error) => {
                 this.setState({
-                    viewIsLoading: false,
                     viewDidError: true,
                     viewDidErrorCode: err.message
                 });
@@ -171,6 +156,9 @@ class SearchPage extends Component<any, ISearchPageState> {
                     `Couldn't search for posts with tag ${this.state.query}: ${err.name}`,
                     { variant: "error" }
                 );
+            })
+            .finally(() => {
+                this.setState({ viewIsLoading: false });
             });
     }