From 0421f5e56561ad960b05f2a4988c52fa98ec8e39 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Wed, 7 Sep 2022 16:12:13 +0100
Subject: [PATCH] Add a button to open the preferences window in the Discord
 setup window

---
 src/app/browser/discord/index.tsx     | 17 +++++++++++++++++
 src/app/browser/preferences/index.tsx |  2 +-
 src/app/main/ipc.ts                   |  1 +
 src/app/preload/index.ts              |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/browser/discord/index.tsx b/src/app/browser/discord/index.tsx
index b74efe4..099c599 100644
--- a/src/app/browser/discord/index.tsx
+++ b/src/app/browser/discord/index.tsx
@@ -9,6 +9,8 @@ import { getAccounts, RequestState, Root, useAsync, useDiscordPresenceSource, us
 export interface DiscordSetupProps {
     users?: string[];
     friend_nsa_id?: string;
+    /** @default true */
+    show_preferences_button?: boolean;
 }
 
 enum DiscordSourceType {
@@ -158,6 +160,15 @@ export default function DiscordSetup(props: DiscordSetupProps) {
                     style={[styles.textInput, theme.textInput]} />
             </> : null}
 
+            {discord_presence_source && (props.show_preferences_button ?? true) ? <>
+                <Text style={[styles.help, styles.header, theme.text]}>Configure additional options for Discord Rich Presence</Text>
+                <View style={[styles.button, styles.buttonPreferences]}>
+                    <Button title="Preferences"
+                        onPress={() => ipc.showPreferencesWindow()}
+                        color={'#' + (accent_colour ?? DEFAULT_ACCENT_COLOUR)} />
+                </View>
+            </> : null}
+
             <View style={styles.buttons}>
                 <View style={styles.button}>
                     <Button title="Cancel"
@@ -222,6 +233,12 @@ const styles = StyleSheet.create({
     button: {
         marginLeft: 10,
     },
+    buttonPreferences: {
+        marginTop: 10,
+        marginLeft: 0,
+        flexDirection: 'row',
+        justifyContent: 'flex-start',
+    },
 });
 
 const light = StyleSheet.create({
diff --git a/src/app/browser/preferences/index.tsx b/src/app/browser/preferences/index.tsx
index 72ae840..b38c3d7 100644
--- a/src/app/browser/preferences/index.tsx
+++ b/src/app/browser/preferences/index.tsx
@@ -159,7 +159,7 @@ export default function Preferences(props: PreferencesProps) {
 
                     <View style={styles.button}>
                         <Button title="Discord Rich Presence setup"
-                            onPress={() => ipc.showDiscordModal()}
+                            onPress={() => ipc.showDiscordModal({show_preferences_button: false})}
                             color={'#' + (accent_colour ?? DEFAULT_ACCENT_COLOUR)} />
                     </View>
 
diff --git a/src/app/main/ipc.ts b/src/app/main/ipc.ts
index b33f49c..662530d 100644
--- a/src/app/main/ipc.ts
+++ b/src/app/main/ipc.ts
@@ -83,6 +83,7 @@ export function setupIpc(appinstance: App, ipcMain: IpcMain) {
     ipcMain.handle('nxapi:coral:friendcode', (e, token: string, friendcode: string, hash?: string) => store.users.get(token).then(u => u.nso.getUserByFriendCode(friendcode, hash)).then(r => r.result));
     ipcMain.handle('nxapi:coral:addfriend', (e, token: string, nsaid: string) => store.users.get(token).then(u => u.addFriend(nsaid)));
 
+    ipcMain.handle('nxapi:window:showpreferences', () => appinstance.showPreferencesWindow().id);
     ipcMain.handle('nxapi:window:showfriend', (e, props: FriendProps) => createWindow(WindowType.FRIEND, props, {
         parent: BrowserWindow.fromWebContents(e.sender) ?? undefined,
         modal: true,
diff --git a/src/app/preload/index.ts b/src/app/preload/index.ts
index 80dc5e7..b475989 100644
--- a/src/app/preload/index.ts
+++ b/src/app/preload/index.ts
@@ -65,6 +65,7 @@ const ipc = {
     getNintendoAccountMoonToken: (id: string) => inv<string | undefined>('moon:gettoken', id),
     getSavedMoonToken: (token: string) => inv<SavedMoonToken | undefined>('moon:getcachedtoken', token),
 
+    showPreferencesWindow: () => inv<number>('window:showpreferences'),
     showFriendModal: (props: FriendProps) => inv<number>('window:showfriend', props),
     showDiscordModal: (props: DiscordSetupProps = {}) => inv<number>('window:discord', props),
     showAddFriendModal: (props: AddFriendProps) => inv<number>('window:addfriend', props),