From 6a3dc3264fb023f844cde74d7774d2fb7b058505 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Tue, 15 Sep 2020 11:44:46 -0500
Subject: [PATCH] Get it working for non-setup site.

---
 src/shared/components/main.tsx  | 37 +++++++++++++++------------------
 src/shared/components/setup.tsx |  2 +-
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/shared/components/main.tsx b/src/shared/components/main.tsx
index 33d79ec1..54bb66b9 100644
--- a/src/shared/components/main.tsx
+++ b/src/shared/components/main.tsx
@@ -152,6 +152,11 @@ export class Main extends Component<any, MainState> {
   }
 
   componentDidMount() {
+    // This means it hasn't been set up yet
+    if (!this.state.siteRes.site) {
+      this.context.router.history.push('/setup');
+    }
+
     WebSocketService.Instance.communityJoin({ community_id: 0 });
   }
 
@@ -240,7 +245,9 @@ export class Main extends Component<any, MainState> {
   }
 
   get documentTitle(): string {
-    return `${this.state.siteRes.site.name}`;
+    return `${
+      this.state.siteRes.site ? this.state.siteRes.site.name : 'Lemmy'
+    }`;
   }
 
   render() {
@@ -250,12 +257,14 @@ export class Main extends Component<any, MainState> {
           title={this.documentTitle}
           path={this.context.router.route.match.url}
         />
-        <div class="row">
-          <main role="main" class="col-12 col-md-8">
-            {this.posts()}
-          </main>
-          <aside class="col-12 col-md-4">{this.mySidebar()}</aside>
-        </div>
+        {this.state.siteRes.site && (
+          <div class="row">
+            <main role="main" class="col-12 col-md-8">
+              {this.posts()}
+            </main>
+            <aside class="col-12 col-md-4">{this.mySidebar()}</aside>
+          </div>
+        )}
       </div>
     );
   }
@@ -394,7 +403,7 @@ export class Main extends Component<any, MainState> {
   }
 
   siteName() {
-    return <h5 class="mb-0">{`${this.state.siteRes.site.name}`}</h5>;
+    return <h5 class="mb-0">{`${this.documentTitle}`}</h5>;
   }
 
   admins() {
@@ -719,18 +728,6 @@ export class Main extends Component<any, MainState> {
       let data = res.data as ListCommunitiesResponse;
       this.state.trendingCommunities = data.communities;
       this.setState(this.state);
-    } else if (res.op == UserOperation.GetSite) {
-      let data = res.data as GetSiteResponse;
-
-      // This means it hasn't been set up yet
-      if (!data.site) {
-        this.context.router.history.push('/setup');
-      }
-      this.state.siteRes.admins = data.admins;
-      this.state.siteRes.site = data.site;
-      this.state.siteRes.banned = data.banned;
-      this.state.siteRes.online = data.online;
-      this.setState(this.state);
     } else if (res.op == UserOperation.EditSite) {
       let data = res.data as SiteResponse;
       this.state.siteRes.site = data.site;
diff --git a/src/shared/components/setup.tsx b/src/shared/components/setup.tsx
index 6360ec5a..33fa4432 100644
--- a/src/shared/components/setup.tsx
+++ b/src/shared/components/setup.tsx
@@ -205,7 +205,7 @@ export class Setup extends Component<any, State> {
       UserService.Instance.login(data);
       this.setState(this.state);
     } else if (res.op == UserOperation.CreateSite) {
-      this.props.history.push('/');
+      window.location.href = '/';
     }
   }
 }