From 33d42991f3c59f2011351fcd81a93c917b32f311 Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Sun, 16 Feb 2020 14:49:55 -0500
Subject: [PATCH] Comment out unnecessary console logs and update getConfig

---
 package-lock.json                      | 2 +-
 src/components/AppLayout/AppLayout.tsx | 2 +-
 src/components/Post/Post.tsx           | 4 ++--
 src/pages/Activity.tsx                 | 4 ++--
 src/pages/Search.tsx                   | 2 +-
 src/pages/Settings.tsx                 | 2 +-
 src/pages/You.tsx                      | 2 +-
 src/utilities/settings.tsx             | 9 +++++++++
 8 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1fbea6f..7d9d9be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "hyperspace",
-  "version": "1.1.0-beta2",
+  "version": "1.1.0-beta4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx
index bec8751..3f86ee5 100644
--- a/src/components/AppLayout/AppLayout.tsx
+++ b/src/components/AppLayout/AppLayout.tsx
@@ -324,7 +324,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
      */
     searchForQuery(what: string) {
         what = what.replace(/^#/g, "tag:");
-        console.log(what);
+        // console.log(what);
         window.location.href = isDesktopApp()
             ? "hyperspace://hyperspace/app/index.html#/search?query=" + what
             : "/#/search?query=" + what;
diff --git a/src/components/Post/Post.tsx b/src/components/Post/Post.tsx
index 99d8278..b2a0f36 100644
--- a/src/components/Post/Post.tsx
+++ b/src/components/Post/Post.tsx
@@ -119,7 +119,7 @@ export class Post extends React.Component<any, IPostState> {
             })
             .catch((err: Error) => {
                 this.props.enqueueSnackbar("Couldn't delete post: " + err.name);
-                console.log(err.message);
+                console.error(err.message);
             });
     }
 
@@ -405,7 +405,7 @@ export class Post extends React.Component<any, IPostState> {
             emojis.concat(reblogger.emojis);
         }
 
-        console.log(post);
+        // console.log(post);
 
         return (
             <>
diff --git a/src/pages/Activity.tsx b/src/pages/Activity.tsx
index ad12078..46655dd 100644
--- a/src/pages/Activity.tsx
+++ b/src/pages/Activity.tsx
@@ -83,7 +83,7 @@ class ActivityPage extends Component<any, IActivityPageState> {
                     viewLoading: false,
                     viewErrored: true
                 });
-                console.log(err.message);
+                console.error(err.message);
             });
 
         this.client
@@ -101,7 +101,7 @@ class ActivityPage extends Component<any, IActivityPageState> {
                     viewLoading: false,
                     viewErrored: true
                 });
-                console.log(err.message);
+                console.error(err.message);
             });
     }
 
diff --git a/src/pages/Search.tsx b/src/pages/Search.tsx
index 9e00c3e..4baee90 100644
--- a/src/pages/Search.tsx
+++ b/src/pages/Search.tsx
@@ -159,7 +159,7 @@ class SearchPage extends Component<any, ISearchPageState> {
                     viewDidLoad: true,
                     viewIsLoading: false
                 });
-                console.log(this.state.tagResults);
+                // console.log(this.state.tagResults);
             })
             .catch((err: Error) => {
                 this.setState({
diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index 0dc0efd..a09a7dc 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -170,7 +170,7 @@ class SettingsPage extends Component<any, ISettingsState> {
         getConfig().then((result: any) => {
             if (result !== undefined) {
                 let config: Config = result;
-                console.log(!config.federation.allowPublicPosts);
+                // console.log(!config.federation.allowPublicPosts);
                 this.setState({
                     federated: config.federation.allowPublicPosts
                 });
diff --git a/src/pages/You.tsx b/src/pages/You.tsx
index 62aea51..47fcc00 100644
--- a/src/pages/You.tsx
+++ b/src/pages/You.tsx
@@ -74,7 +74,7 @@ class You extends Component<IYouProps, IYouState> {
 
     getAccount() {
         let acct = localStorage.getItem("account");
-        console.log(acct);
+        // console.log(acct);
         if (acct) {
             return JSON.parse(acct);
         }
diff --git a/src/utilities/settings.tsx b/src/utilities/settings.tsx
index b71d1a2..6ca554e 100644
--- a/src/utilities/settings.tsx
+++ b/src/utilities/settings.tsx
@@ -136,6 +136,15 @@ export function createUserDefaults() {
 export async function getConfig(): Promise<Config | undefined> {
     try {
         const resp = await axios.get("config.json");
+
+        let { location } = resp.data;
+
+        if (!location.endsWith("/")) {
+            console.warn(
+                "Location does not have a backslash, so Hyperspace has added it automatically."
+            );
+            resp.data.location = location + "/";
+        }
         return resp.data as Config;
     } catch (err) {
         console.error(