From 8bf135ed93f547caa865e4d0082ea236e02a5165 Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Sun, 28 Apr 2019 13:16:21 -0400
Subject: [PATCH 1/5] Assign key to media uploading sb, change variants, close
 in catch (fix #32)

---
 src/pages/Compose.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Compose.tsx b/src/pages/Compose.tsx
index 36f120e..421f229 100644
--- a/src/pages/Compose.tsx
+++ b/src/pages/Compose.tsx
@@ -133,7 +133,7 @@ class Composer extends Component<any, IComposerState> {
         }).then((media: FileList) => {
             let mediaForm = new FormData();
             mediaForm.append('file', media[0]);
-            const uploading = this.props.enqueueSnackbar("Uploading media...", { persist: true })
+            this.props.enqueueSnackbar("Uploading media...", { persist: true, key: "media-upload" })
             this.client.post('/media', mediaForm).then((resp: any) => {
                 let attachment: Attachment = resp.data;
                 let attachments = this.state.attachments;
@@ -143,13 +143,14 @@ class Composer extends Component<any, IComposerState> {
                     attachments = [attachment];
                 }
                 this.setState({ attachments });
-                this.props.closeSnackbar(uploading);
+                this.props.closeSnackbar("media-upload");
                 this.props.enqueueSnackbar('Media uploaded.');
             }).catch((err: Error) => {
-                this.props.enqueueSnackbar("Couldn't upload media: " + err.name);
+                this.props.closeSnackbar("media-upload");
+                this.props.enqueueSnackbar("Couldn't upload media: " + err.name, { variant: "error" });
             })
         }).catch((err: Error) => {
-            this.props.enqueueSnackbar("Couldn't get media: " + err.name);
+            this.props.enqueueSnackbar("Couldn't get media: " + err.name, { variant: "error" });
             console.error(err.message);
         });
     }

From 1a05cb941774495c6e173e4ccb831d12ce0c3f2e Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Sun, 28 Apr 2019 15:38:44 -0400
Subject: [PATCH 2/5] Dynamically change Hyperspace name in settings

---
 src/pages/Settings.tsx | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index 76b7720..5ac6a1c 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -24,7 +24,7 @@ import {
 } from '@material-ui/core';
 import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import {styles} from './PageLayout.styles';
-import {setUserDefaultBool, getUserDefaultBool, getUserDefaultTheme, setUserDefaultTheme, getUserDefaultVisibility, setUserDefaultVisibility} from '../utilities/settings';
+import {setUserDefaultBool, getUserDefaultBool, getUserDefaultTheme, setUserDefaultTheme, getUserDefaultVisibility, setUserDefaultVisibility, getConfig} from '../utilities/settings';
 import {canSendNotifications, browserSupportsNotificationRequests} from '../utilities/notifications';
 import {themes, defaultTheme} from '../types/HyperspaceTheme';
 import ThemePreview from '../components/ThemePreview';
@@ -43,6 +43,7 @@ interface ISettingsState {
     resetSettingsDialog: boolean;
     previewTheme: Theme;
     defaultVisibility: Visibility;
+    brandName: string;
 }
 
 class SettingsPage extends Component<any, ISettingsState> {
@@ -61,7 +62,8 @@ class SettingsPage extends Component<any, ISettingsState> {
             resetHyperspaceDialog: false,
             resetSettingsDialog: false,
             previewTheme: setHyperspaceTheme(getUserDefaultTheme()) || setHyperspaceTheme(defaultTheme),
-            defaultVisibility: getUserDefaultVisibility() || "public"
+            defaultVisibility: getUserDefaultVisibility() || "public",
+            brandName: "Hyperspace"
         }
 
         this.toggleDarkMode = this.toggleDarkMode.bind(this);
@@ -75,6 +77,16 @@ class SettingsPage extends Component<any, ISettingsState> {
         this.setVisibility = this.setVisibility.bind(this);
     }
 
+    componentDidMount() {
+        getConfig().then((config: any) => {
+            this.setState({
+                brandName: config.branding.name
+            })
+        }).catch((err: Error) => {
+            console.error(err.message);
+        })
+    }
+
     toggleDarkMode() {
         this.setState({ darkModeEnabled: !this.state.darkModeEnabled });
         setUserDefaultBool('darkModeEnabled', !this.state.darkModeEnabled);
@@ -253,10 +265,10 @@ class SettingsPage extends Component<any, ISettingsState> {
                 open={this.state.resetHyperspaceDialog}
                 onClose={() => this.toggleResetDialog()}
                 >
-                <DialogTitle id="alert-dialog-title">Reset Hyperspace?</DialogTitle>
+                <DialogTitle id="alert-dialog-title">Reset {this.state.brandName}?</DialogTitle>
                 <DialogContent>
                     <DialogContentText id="alert-dialog-description">
-                        Are you sure you want to reset Hyperspace? You'll need to sign in again and grant Hyperspace access to use it again.
+                        Are you sure you want to reset {this.state.brandName}? You'll need to re-authorize {this.state.brandName} access again.
                     </DialogContentText>
                 </DialogContent>
                 <DialogActions>
@@ -389,7 +401,7 @@ class SettingsPage extends Component<any, ISettingsState> {
                             </ListItemSecondaryAction>
                         </ListItem>
                         <ListItem>
-                            <ListItemText primary="Reset Hyperspace" secondary="Deletes all data and resets the app"/>
+                            <ListItemText primary={`Reset ${this.state.brandName}`} secondary="Deletes all data and resets the app"/>
                             <ListItemSecondaryAction>
                                 <Button onClick={() => this.toggleResetDialog()}>
                                     Reset

From 7ebfff138bfa33c532a9c1e856ac2560433ec3e4 Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Sun, 28 Apr 2019 15:50:18 -0400
Subject: [PATCH 3/5] Dynamically change app name in rrgistry, change name in
 Welcome pages

---
 src/interfaces/Config.tsx | 22 ++++++++++++++++++++++
 src/pages/Welcome.tsx     | 21 +++++++++++++++------
 src/utilities/login.tsx   |  6 ++++--
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 src/interfaces/Config.tsx

diff --git a/src/interfaces/Config.tsx b/src/interfaces/Config.tsx
new file mode 100644
index 0000000..aa278db
--- /dev/null
+++ b/src/interfaces/Config.tsx
@@ -0,0 +1,22 @@
+import {License} from '../types/Config';
+
+export interface Config {
+    version: string;
+    location: string;
+    branding?: {
+        name?: string;
+        logo?: string;
+        background?: string;
+    };
+    developer?: string;
+    federated?: string;
+    registration?: {
+        defaultInstance?: string;
+    };
+    admin?: {
+        name?: string;
+        account?: string;
+    };
+    license: License;
+    respository?: string;
+}
\ No newline at end of file
diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx
index 40b4769..8e749e8 100644
--- a/src/pages/Welcome.tsx
+++ b/src/pages/Welcome.tsx
@@ -151,7 +151,12 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
             const scopes = 'read write follow';
             const baseurl = this.getLoginUser(this.state.user);
             localStorage.setItem("baseurl", baseurl);
-            createHyperspaceApp(scopes, baseurl, this.state.defaultRedirectAddress).then((resp: any) => {
+            createHyperspaceApp(
+                this.state.brandName? this.state.brandName: "Hyperspace", 
+                scopes, 
+                baseurl, 
+                this.state.defaultRedirectAddress
+            ).then((resp: any) => {
                 let saveSessionForCrashing: SaveClientSession = {
                     clientId: resp.clientId,
                     clientSecret: resp.clientSecret,
@@ -175,9 +180,13 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
         console.log("Creating an emergency login...")
         const scopes = "read write follow";
         const baseurl = localStorage.getItem('baseurl') || this.getLoginUser(this.state.user);
-        Mastodon.registerApp(this.state.brandName? this.state.brandName: "Hyperspace", {
-            scopes: scopes
-        }, baseurl).then((appData: any) => {
+        Mastodon.registerApp(
+            this.state.brandName? this.state.brandName: "Hyperspace", 
+            {
+                scopes: scopes
+            }, 
+            baseurl
+        ).then((appData: any) => {
             let saveSessionForCrashing: SaveClientSession = {
                 clientId: appData.clientId,
                 clientSecret: appData.clientSecret,
@@ -260,7 +269,7 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
                     localStorage.setItem("access_token", tokenData.access_token);
                     window.location.href=`https://${window.location.host}/#/`;
                 }).catch((err: Error) => {
-                    this.props.enqueueSnackbar("Couldn't authorize Hyperspace: " + err.name, {variant: 'error'});
+                    this.props.enqueueSnackbar(`Couldn't authorize ${this.state.brandName? this.state.brandName: "Hyperspace"}: ${err.name}`, {variant: 'error'});
                     console.error(err.message);
                 })
             }
@@ -323,7 +332,7 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
         return (
                 <div>
                     <Typography variant="h5">Howdy, {this.state.user? this.state.user.split("@")[0]: "user"}</Typography>
-                    <Typography>To continue, finish signing in on your instance's website and authorize Hyperspace.</Typography>
+                    <Typography>To continue, finish signing in on your instance's website and authorize {this.state.brandName? this.state.brandName: "Hyperspace"}.</Typography>
                     <div className={classes.middlePadding}/>
                     <div style={{ display: "flex" }}>
                         <div className={classes.flexGrow}/>
diff --git a/src/utilities/login.tsx b/src/utilities/login.tsx
index 792b5ca..a224bb8 100644
--- a/src/utilities/login.tsx
+++ b/src/utilities/login.tsx
@@ -2,12 +2,14 @@ import Mastodon from 'megalodon';
 
 /**
  * Creates the Hyperspace app with the appropriate Redirect URI
+ * @param name The name of the app (if not Hyperspace, will use `name (Hyperspace-like)`)
  * @param scopes The scopes that the app needs
  * @param baseurl The base URL of the instance
  * @param redirect_uri The URL to redirect to when authorizing
  */
-export function createHyperspaceApp(scopes: string, baseurl: string, redirect_uri: string) {
-    return Mastodon.createApp("Hyperspace", {
+export function createHyperspaceApp(name: string, scopes: string, baseurl: string, redirect_uri: string) {
+    let appName = name === "Hyperspace"? "Hyperspace": `${name} (Hyperspace-like)`
+    return Mastodon.createApp(appName, {
         scopes: scopes,
         redirect_uris: redirect_uri,
         website: 'https://hyperspace.marquiskurt.net',

From 80a59081e989855b3ca5562953d97f42c2e4be5c Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Mon, 29 Apr 2019 14:38:28 -0400
Subject: [PATCH 4/5] Fix brand name stuff in AppLayout

---
 src/components/AppLayout/AppLayout.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx
index 87cec2f..53c3c6a 100644
--- a/src/components/AppLayout/AppLayout.tsx
+++ b/src/components/AppLayout/AppLayout.tsx
@@ -177,10 +177,10 @@ export class AppLayout extends Component<any, IAppLayoutState> {
               <Typography className={classes.titleBarText}>Careful: you're running in developer mode.</Typography>
             </div>
           );
-        } else if ((navigator.userAgent.includes("Hyperspace") || navigator.userAgent.includes("Electron")) && navigator.userAgent.includes("Macintosh")) {
+        } else if ((navigator.userAgent.includes(this.state.brandName || "Hyperspace") || navigator.userAgent.includes("Electron")) && navigator.userAgent.includes("Macintosh")) {
           return (
             <div className={classes.titleBarRoot}>
-              <Typography className={classes.titleBarText}>Hyperspace</Typography>
+              <Typography className={classes.titleBarText}>{this.state.brandName? this.state.brandName: "Hyperspace"}</Typography>
             </div>
           );
         }
@@ -376,10 +376,10 @@ export class AppLayout extends Component<any, IAppLayoutState> {
           open={this.state.logOutOpen}
           onClose={() => this.toggleLogOutDialog()}
           >
-          <DialogTitle id="alert-dialog-title">Log out of Hyperspace?</DialogTitle>
+          <DialogTitle id="alert-dialog-title">Log out of {this.state.brandName? this.state.brandName: "Hyperspace"}</DialogTitle>
           <DialogContent>
               <DialogContentText id="alert-dialog-description">
-                You'll need to remove Hyperspace from your list of authorized apps and log in again if you want to use Hyperspace.
+                You'll need to remove {this.state.brandName? this.state.brandName: "Hyperspace"} from your list of authorized apps and log in again if you want to use {this.state.brandName? this.state.brandName: "Hyperspace"}.
               </DialogContentText>
           </DialogContent>
           <DialogActions>

From 6ed271f3498170e2e3e8d65e79c29cd510267597 Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Mon, 29 Apr 2019 14:44:05 -0400
Subject: [PATCH 5/5] Fix well-known login caused by faulty check in federation
 status

---
 src/pages/Welcome.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx
index 675c4a5..5bfe107 100644
--- a/src/pages/Welcome.tsx
+++ b/src/pages/Welcome.tsx
@@ -137,10 +137,16 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
     }
 
     getLoginUser(user: string) {
-        if (this.state.federates || user.includes("@")) {
-            let newUser = user;
-            this.setState({ user: newUser })
-            return "https://" + newUser.split("@")[1];
+        if (user.includes("@")) {
+            if (this.state.federates) {
+                let newUser = user;
+                this.setState({ user: newUser });
+                return "https://" + newUser.split("@")[1];
+            } else {
+                let newUser = `${user}@${this.state.registerBase? this.state.registerBase: "mastodon.social"}`;
+                this.setState({ user: newUser });
+                return "https://" + (this.state.registerBase? this.state.registerBase: "mastodon.social");
+            }
         } else {
             let newUser = `${user}@${this.state.registerBase? this.state.registerBase: "mastodon.social"}`;
             this.setState({ user: newUser });