From a298057a84ea59952fd3346ba3b7408b5e4a4661 Mon Sep 17 00:00:00 2001
From: nin0dev <personal@nin0dev.com>
Date: Tue, 11 Jun 2024 06:46:17 -0400
Subject: [PATCH] grammarly + new settings structure

---
 src/plugins/rpcEditor/ReplaceSettings.tsx | 83 ++++++++++-------------
 src/plugins/rpcEditor/index.tsx           | 40 ++++++-----
 2 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/src/plugins/rpcEditor/ReplaceSettings.tsx b/src/plugins/rpcEditor/ReplaceSettings.tsx
index 1bba4a097..8f93e6619 100644
--- a/src/plugins/rpcEditor/ReplaceSettings.tsx
+++ b/src/plugins/rpcEditor/ReplaceSettings.tsx
@@ -62,7 +62,7 @@ export function ReplaceTutorial() {
                 <pre style={{ fontFamily: "monospace" }}>
                     :name:, :details:, :state:
                     <br />
-                    :large_image::large_text:, :small_image:, :small_text:
+                    :large_image:, :large_text:, :small_image:, :small_text:
                 </pre>
             </Forms.FormText>
         </>
@@ -93,16 +93,19 @@ export function ReplaceSettings({ appIds, update, save }: SettingsProps) {
             {
                 appIds.map((setting, i) =>
                     <Card style={{ padding: "1em 1em 0" }}>
-                        <Switch
-                            value={setting.enabled}
-                            onChange={value => {
-                                onChange(value, i, "enabled");
-                            }}
-                            className={Margins.bottom16}
-                            hideBorder={true}
-                        >
-                            Enable editing of {setting.appName}
-                        </Switch>
+                        {
+                            setting.appName !== "Unknown" ?
+                                <Switch
+                                    value={setting.enabled}
+                                    onChange={value => {
+                                        onChange(value, i, "enabled");
+                                    }}
+                                    className={Margins.bottom8}
+                                    hideBorder={true}
+                                >
+                                    Edit the {setting.appName} app
+                                </Switch> : <Forms.FormTitle tag="h3" className={Margins.bottom8}>Add new application</Forms.FormTitle>
+                        }
                         <Forms.FormTitle>Application ID</Forms.FormTitle>
                         <CheckedTextInput
                             value={setting.appId}
@@ -113,43 +116,27 @@ export function ReplaceSettings({ appIds, update, save }: SettingsProps) {
                                 !v || isValidSnowflake(v) || "Invalid application ID"
                             }
                         />
-                        {setting.activityType === ActivityType.STREAMING &&
-                            <>
-                                <Forms.FormTitle>Stream URL</Forms.FormTitle>
-                                <CheckedTextInput
-                                    value={setting.streamUrl}
-                                    onChange={async v => {
-                                        onChange(v, i, "streamUrl");
-                                    }}
-                                    validate={st => !/https?:\/\/(www\.)?(twitch\.tv|youtube\.com)\/\w+/.test(st) && "Only Twitch and Youtube URLs will work." || true}
-                                />
-                            </>}
-                        <Forms.FormTitle>New activity type</Forms.FormTitle>
-                        <Select
-                            options={[
-                                { label: "Playing", value: ActivityType.PLAYING },
-                                { label: "Watching", value: ActivityType.WATCHING },
-                                { label: "Listening", value: ActivityType.LISTENING },
-                                { label: "Competing", value: ActivityType.COMPETING },
-                                { label: "Streaming", value: ActivityType.STREAMING }
-                            ]}
-                            select={value => {
-                                onChange(value, i, "activityType");
-                            }}
-                            className={Margins.bottom16}
-                            isSelected={value => setting.activityType === value}
-                            serialize={identity}
-                        />
-                        <Switch
-                            value={setting.swapNameAndDetails}
-                            onChange={value => {
-                                onChange(value, i, "swapNameAndDetails");
-                            }}
-                            className={Margins.bottom16}
-                            hideBorder={true}
-                        >
-                            Swap presence name and details
-                        </Switch>
+                        {
+                            setting.appName !== "Unknown" ?
+                                <>
+                                    <Forms.FormTitle className={Margins.top8}>New activity type</Forms.FormTitle>
+                                    <Select
+                                        options={[
+                                            { label: "Playing", value: ActivityType.PLAYING },
+                                            { label: "Watching", value: ActivityType.WATCHING },
+                                            { label: "Listening", value: ActivityType.LISTENING },
+                                            { label: "Competing", value: ActivityType.COMPETING },
+                                            { label: "Streaming", value: ActivityType.STREAMING }
+                                        ]}
+                                        select={value => {
+                                            onChange(value, i, "activityType");
+                                        }}
+                                        className={Margins.top8}
+                                        isSelected={value => setting.newActivityType === value}
+                                        serialize={identity}
+                                    />
+                                </> : null
+                        }
                     </Card>
                 )
             }
diff --git a/src/plugins/rpcEditor/index.tsx b/src/plugins/rpcEditor/index.tsx
index 7bf363782..d84dbc0b7 100644
--- a/src/plugins/rpcEditor/index.tsx
+++ b/src/plugins/rpcEditor/index.tsx
@@ -17,10 +17,16 @@ const APP_IDS_KEY = "ReplaceActivityType_appids";
 export type AppIdSetting = {
     appName: string;
     appId: string;
-    swapNameAndDetails: boolean;
-    activityType: ActivityType;
-    streamUrl: string;
     enabled: boolean;
+    newActivityType: ActivityType;
+    newName: string,
+    newDetails: string,
+    newState: string,
+    newLargeImageUrl: string,
+    newLargeImageText: string,
+    newSmallImageUrl: string,
+    newSmallImageText: string;
+    newStreamUrl: string;
 };
 
 export interface Activity {
@@ -58,12 +64,18 @@ export const enum ActivityType {
 }
 
 export const makeEmptyAppId: () => AppIdSetting = () => ({
-    appId: "",
     appName: "Unknown",
-    streamUrl: "",
-    swapNameAndDetails: false,
-    activityType: ActivityType.PLAYING,
-    enabled: true
+    appId: "",
+    enabled: true,
+    newActivityType: ActivityType.PLAYING,
+    newName: "",
+    newDetails: "",
+    newState: "",
+    newLargeImageUrl: "",
+    newLargeImageText: "",
+    newSmallImageUrl: "",
+    newSmallImageText: "",
+    newStreamUrl: "",
 });
 
 let appIds = [makeEmptyAppId()];
@@ -112,16 +124,10 @@ export default definePlugin({
         console.log(activity);
         appIds.forEach(app => {
             if (app.enabled && app.appId === activity.application_id) {
-                activity.type = app.activityType;
+                activity.type = app.newActivityType;
 
-                if (app.activityType === ActivityType.STREAMING && app.streamUrl) {
-                    activity.url = app.streamUrl;
-                }
-
-                if (app.swapNameAndDetails) {
-                    const media = activity.details;
-                    activity.details = activity.name;
-                    activity.name = media;
+                if (app.newActivityType === ActivityType.STREAMING && app.newStreamUrl) {
+                    activity.url = app.newStreamUrl;
                 }
 
             }