Misc Changes

darbyjack · darbyjack · commit 08cd0f8ea515 · 2022-03-24T10:53:39.000-05:00
- Made the toolbox in the top left clickable
- Added social spy support for the converters
diff --git a/converters/chatchat/deluxechat.ts b/converters/chatchat/deluxechat.ts
@@ -29,6 +29,9 @@ const ChatChatDeluxeChatConverter = new Converter<
       "recipient-format": {
         parts: [],
       },
+      "social-spy-format": {
+        parts: [],
+      },
     };
     if (deluxechatConfig.formats) {
       const formats = deluxechatConfig.formats;
@@ -119,6 +122,17 @@ const ChatChatDeluxeChatConverter = new Converter<
             break;
         }
       });
+
+      if (formats.social_spy) {
+        const socialSpyFormat = formats.social_spy;
+        const ccSocialSpyPartsFormat: string[] = [];
+
+        ccSocialSpyPartsFormat.push(MiniMessage(socialSpyFormat));
+        ccSocialSpyPartsFormat.push("<message>");
+
+        chatchatSettingsConfig["social-spy-format"].parts =
+          ccSocialSpyPartsFormat;
+      }
     }
 
     return {
diff --git a/converters/chatchat/essentialschat.ts b/converters/chatchat/essentialschat.ts
@@ -25,6 +25,9 @@ const ChatChatEssentialsChatConverter = new Converter<
       "recipient-format": {
         parts: [],
       },
+      "social-spy-format": {
+        parts: [],
+      },
     };
 
     if (!essentialschatConfig.config || !essentialschatConfig.config.chat) {
@@ -68,6 +71,12 @@ const ChatChatEssentialsChatConverter = new Converter<
       );
     }
 
+    if (essentialschatConfig.language.socialSpyMsgFormat) {
+      chatchatSettingsConfig["social-spy-format"].parts.push(
+        MiniMessage(essentialschatConfig.language.socialSpyMsgFormat)
+      );
+    }
+
     return {
       format: chatchatFormatsConfig,
       settings: chatchatSettingsConfig,
diff --git a/converters/chatchat/venturechat.ts b/converters/chatchat/venturechat.ts
@@ -25,6 +25,9 @@ const ChatChatVentureChatConverter = new Converter<
       "recipient-format": {
         parts: [],
       },
+      "social-spy-format": {
+        parts: [],
+      },
     };
 
     if (venturechatConfig.jsonformatting) {
@@ -93,6 +96,7 @@ const ChatChatVentureChatConverter = new Converter<
 
     const toFormat = venturechatConfig.tellformatto;
     const fromFormat = venturechatConfig.tellformatfrom;
+    const spyFormat = venturechatConfig.tellformatspy;
 
     let ccPartsFormat: string[] = [];
 
@@ -109,6 +113,14 @@ const ChatChatVentureChatConverter = new Converter<
     ccPartsFormat.push("<message>");
     chatchatSettingsConfig["recipient-format"].parts = ccPartsFormat;
 
+    // Reset
+    ccPartsFormat = [];
+
+    // The spy format
+    ccPartsFormat.push(MiniMessage(fromFormat));
+    ccPartsFormat.push("<message>");
+    chatchatSettingsConfig["social-spy-format"].parts = ccPartsFormat;
+
     return {
       format: chatchatFormatsConfig,
       settings: chatchatSettingsConfig,
diff --git a/converters/types/chatchat.ts b/converters/types/chatchat.ts
@@ -12,6 +12,7 @@ export type ChatChatFormat = {
 export interface ChatChatSettingsConfig {
   "sender-format": ChatChatParts;
   "recipient-format": ChatChatParts;
+  "social-spy-format": ChatChatParts;
 }
 
 export interface ChatChatParts {
diff --git a/converters/types/deluxechat.json b/converters/types/deluxechat.json
@@ -98,7 +98,10 @@
               "$ref": "#/definitions/DeluxeChatPrivateMessageFormat"
             }
           },
-          "required": ["to_recipient", "to_sender"]
+          "required": [
+            "to_recipient",
+            "to_sender"
+          ]
         },
         "formats": {
           "type": "object",
@@ -199,4 +202,4 @@
       ]
     }
   }
-}
+}
diff --git a/converters/types/essentialschat.json b/converters/types/essentialschat.json
@@ -13,11 +13,17 @@
           "properties": {
             "msgFormat": {
               "type": "string"
+            },
+            "socialSpyMsgFormat": {
+              "type": "string"
             }
           }
         }
       },
-      "required": ["config", "language"]
+      "required": [
+        "config",
+        "language"
+      ]
     },
     "EssentialsChatConfig": {
       "type": "object",
@@ -26,7 +32,10 @@
           "type": "object",
           "properties": {
             "format": {
-              "type": ["string", "null"]
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "group-formats": {
               "anyOf": [
@@ -44,7 +53,9 @@
           }
         }
       },
-      "required": ["chat"]
+      "required": [
+        "chat"
+      ]
     }
   }
-}
+}
diff --git a/converters/types/essentialschat.ts b/converters/types/essentialschat.ts
@@ -13,5 +13,6 @@ export interface EssentialsChatTypes {
   config: EssentialsChatConfig;
   language: {
     msgFormat?: string;
+    socialSpyMsgFormat?: string;
   };
 }
diff --git a/converters/types/venturechat.json b/converters/types/venturechat.json
@@ -11,14 +11,21 @@
         "tellformatfrom": {
           "type": "string"
         },
+        "tellformatspy": {
+          "type": "string"
+        },
         "jsonformatting": {
           "type": "object",
           "additionalProperties": {
             "$ref": "#/definitions/VentureChatFormat"
           }
         }
       },
-      "required": ["tellformatto", "tellformatfrom"]
+      "required": [
+        "tellformatto",
+        "tellformatfrom",
+        "tellformatspy"
+      ]
     },
     "VentureChatFormat": {
       "type": "object",
@@ -33,7 +40,9 @@
           }
         }
       },
-      "required": ["priority"]
+      "required": [
+        "priority"
+      ]
     },
     "VentureChatJsonComponent": {
       "type": "object",
@@ -51,7 +60,11 @@
           "type": "string"
         }
       },
-      "required": ["hover_text", "click_action", "click_text"]
+      "required": [
+        "hover_text",
+        "click_action",
+        "click_text"
+      ]
     }
   }
-}
+}
diff --git a/converters/types/venturechat.ts b/converters/types/venturechat.ts
@@ -3,6 +3,7 @@
 export interface VentureChatConfig {
   tellformatto: string;
   tellformatfrom: string;
+  tellformatspy: string;
   jsonformatting?: {
     [key: string]: VentureChatFormat;
   };
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -16,30 +16,32 @@ function Toolbox({ Component, pageProps }: AppProps) {
             css={tw`text-white bg-black w-full md:px-8 p-2 h-14 flex flex-row text-white md:px-12`}
           >
             <div css={tw`flex flex-row w-full`}>
-              <div css={tw`flex flex-row`}>
-                <div css={tw`my-auto`}>
-                  <FontAwesomeIcon icon={faToolbox} size={"2x"} />
-                </div>
-                <div css={tw`ml-2 my-auto font-bold text-center`}>
-                  <p
-                    css={css`
-                      margin-bottom: -0.2rem;
-                    `}
-                  >
-                    HelpChat
-                  </p>
-                  <p
-                    css={css`
-                      margin-top: -0.2rem;
-                      ${tw`text-xs`}
-                    `}
-                  >
-                    ToolBox
-                  </p>
+              <Link href={"/"} passHref>
+                <div css={tw`flex flex-row`}>
+                  <div css={tw`my-auto`}>
+                    <FontAwesomeIcon icon={faToolbox} size={"2x"} />
+                  </div>
+                  <div css={tw`ml-2 my-auto font-bold text-center`}>
+                    <p
+                      css={css`
+                        margin-bottom: -0.2rem;
+                      `}
+                    >
+                      HelpChat
+                    </p>
+                    <p
+                      css={css`
+                        margin-top: -0.2rem;
+                        ${tw`text-xs`}
+                      `}
+                    >
+                      ToolBox
+                    </p>
+                  </div>
                 </div>
-              </div>
+              </Link>
               <div css={tw`flex flex-row flex-grow flex-shrink`}>
-                <Link href={"/"}>
+                <Link href={"/"} passHref>
                   <p
                     css={tw`px-3 mx-1 py-2 my-auto ml-auto hover:cursor-pointer`}
                   >
@@ -48,12 +50,13 @@ function Toolbox({ Component, pageProps }: AppProps) {
                 </Link>
                 <Link
                   href={"https://www.spigotmc.org/members/helpchat.1491649/"}
+                  passHref
                 >
                   <p css={tw`px-3 mx-1 py-2 my-auto hover:cursor-pointer`}>
                     Spigot
                   </p>
                 </Link>
-                <Link href={"https://github.com/HelpChat"}>
+                <Link href={"https://github.com/HelpChat"} passHref>
                   <p css={tw`px-3 mx-1 py-2 my-auto hover:cursor-pointer`}>
                     Github
                   </p>
@@ -82,7 +85,7 @@ function Toolbox({ Component, pageProps }: AppProps) {
                       if (Array.isArray(Tools[key])) {
                         (Tools[key] as ToolboxTool[]).forEach((tool) => {
                           children.push(
-                            <Link href={tool.link}>
+                            <Link href={tool.link} passHref>
                               <p
                                 css={tw`px-3 mx-1 pt-3 ml-1 pb-1 hover:cursor-pointer`}
                               >
@@ -99,7 +102,7 @@ function Toolbox({ Component, pageProps }: AppProps) {
                               key1
                             ].forEach((tool) => {
                               children.push(
-                                <Link href={tool.link}>
+                                <Link href={tool.link} passHref>
                                   <p
                                     css={tw`px-3 mx-1 pt-3 ml-2 pb-1 hover:cursor-pointer`}
                                   >
@@ -134,7 +137,7 @@ function Toolbox({ Component, pageProps }: AppProps) {
                     })}
                   </div>
                 </div>
-                <Link href={"https://discord.gg/helpchat"}>
+                <Link href={"https://discord.gg/helpchat"} passHref>
                   <p
                     css={tw`px-3 mx-1 py-2 my-auto hover:cursor-pointer bg-white text-black rounded-md`}
                   >
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -86,7 +86,7 @@ function ToolboxCard({
   link: string;
 }) {
   return (
-    <Link href={link}>
+    <Link href={link} passHref>
       <div
         css={tw`p-3 rounded-md bg-gray-300 hover:cursor-pointer width[13rem] h-48 block grid grid-cols-1 place-items-center`}
       >

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ export type ChatChatFormat = {`
`12`	`12`	`export interface ChatChatSettingsConfig {`
`13`	`13`	`"sender-format": ChatChatParts;`
`14`	`14`	`"recipient-format": ChatChatParts;`
	`15`	`+ "social-spy-format": ChatChatParts;`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`export interface ChatChatParts {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,10 @@`
`98`	`98`	`"$ref": "#/definitions/DeluxeChatPrivateMessageFormat"`
`99`	`99`	`}`
`100`	`100`	`},`
`101`		`- "required": ["to_recipient", "to_sender"]`
	`101`	`+ "required": [`
	`102`	`+ "to_recipient",`
	`103`	`+ "to_sender"`
	`104`	`+ ]`
`102`	`105`	`},`
`103`	`106`	`"formats": {`
`104`	`107`	`"type": "object",`
`@@ -199,4 +202,4 @@`
`199`	`202`	`]`
`200`	`203`	`}`
`201`	`204`	`}`
`202`		`-}`
	`205`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ export interface EssentialsChatTypes {`
`13`	`13`	`config: EssentialsChatConfig;`
`14`	`14`	`language: {`
`15`	`15`	`msgFormat?: string;`
	`16`	`+ socialSpyMsgFormat?: string;`
`16`	`17`	`};`
`17`	`18`	`}`