Merge branch 'b2u3' of github.com:hyperspacedev/hyperspace into media-uploads

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>

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;
+}

src/pages/Settings.tsx

@@ -43,6 +43,7 @@ interface ISettingsState {
     resetSettingsDialog: boolean;
     previewTheme: Theme;
     defaultVisibility: Visibility;
+    brandName: string;
     federated: boolean;
 }
 
@@ -63,6 +64,7 @@ class SettingsPage extends Component<any, ISettingsState> {
             resetSettingsDialog: false,
             previewTheme: setHyperspaceTheme(getUserDefaultTheme()) || setHyperspaceTheme(defaultTheme),
             defaultVisibility: getUserDefaultVisibility() || "public",
+            brandName: "Hyperspace",
             federated: true
         }
 
@@ -78,6 +80,13 @@ class SettingsPage extends Component<any, ISettingsState> {
     }
 
     componentDidMount() {
+        getConfig().then((config: any) => {
+            this.setState({
+                brandName: config.branding.name
+            })
+        }).catch((err: Error) => {
+            console.error(err.message);
+        });
         this.getFederatedStatus();
     }
 
@@ -265,10 +274,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>
@@ -401,7 +410,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

src/pages/Welcome.tsx

@@ -137,10 +137,16 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
     }
 
     getLoginUser(user: string) {
-        if (this.state.federates || user.includes("@")) {
+        if (user.includes("@")) {
-            let newUser = user;
+            if (this.state.federates) {
-            this.setState({ user: newUser })
+                let newUser = user;
-            return "https://" + newUser.split("@")[1];
+                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 });
@@ -154,7 +160,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,
@@ -178,9 +189,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", {
+        Mastodon.registerApp(
-            scopes: scopes
+            this.state.brandName? this.state.brandName: "Hyperspace", 
-        }, baseurl).then((appData: any) => {
+            {
+                scopes: scopes
+            }, 
+            baseurl
+        ).then((appData: any) => {
             let saveSessionForCrashing: SaveClientSession = {
                 clientId: appData.clientId,
                 clientSecret: appData.clientSecret,
@@ -274,7 +289,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);
                 })
             }
@@ -336,7 +351,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}/>

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) {
+export function createHyperspaceApp(name: string, scopes: string, baseurl: string, redirect_uri: string) {
-    return Mastodon.createApp("Hyperspace", {
+    let appName = name === "Hyperspace"? "Hyperspace": `${name} (Hyperspace-like)`
+    return Mastodon.createApp(appName, {
         scopes: scopes,
         redirect_uris: redirect_uri,
         website: 'https://hyperspace.marquiskurt.net',