Freemoji: nitro check and explicit toggle

Rico040 · May 21, 2024 · ea2574a · ea2574a
1 parent 5b7ab53
commit ea2574a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/plugins/freemoji/src/Settings.tsx b/plugins/freemoji/src/Settings.tsx
@@ -31,6 +31,14 @@ export default () => {
                     onValueChange={ () => {storage.hyperlink = !storage.hyperlink;}}
                     note=""
                 />
+                <FormSwitchRow
+                    label="Force Freemoji"
+                    subLabel="Explicitly force Freemoji even if you have nitro (useful for testing)"
+                    leading={<Forms.FormIcon source={getAssetIDByName("img_nitro_emojis")} />}
+                    value={storage.forceMoji}
+                    onValueChange={ () => {storage.forceMoji = !storage.forceMoji;}}
+                    note=""
+                />
             </FormSection>
             <FormSection title="Emoji Size" >
                 {Object.entries(sizeOptions).map(([name, size]) => <FormRadioRow

diff --git a/plugins/freemoji/src/index.ts b/plugins/freemoji/src/index.ts
@@ -1,10 +1,13 @@
 import { storage } from "@vendetta/plugin";
+import { findByStoreName } from "@vendetta/metro";
 import nitroChecks from "./patches/nitroChecks";
 import sendMessage from "./patches/sendMessage";
 
 // Default settings
 storage.emojiSize ??= 48;
 storage.hyperlink ??= true;
+storage.haveNitro ??= findByStoreName("UserStore").getCurrentUser()?.purchasedFlags != 0;
+storage.forceMoji ??= false;
 
 // Migration code, used to be string containing a number but is now just a number
 if (typeof storage.emojiSize === "string") storage.emojiSize = parseInt(storage.emojiSize);

diff --git a/plugins/freemoji/src/msgProcessor.ts b/plugins/freemoji/src/msgProcessor.ts
@@ -41,7 +41,7 @@ function extractUnusableEmojis(messageString: string, size: number) {
 }
 
 export default function modifyIfNeeded(msg: Message) {
-	if (!msg.content.match(hasEmotesRegex)) return;
+	if (!msg.content.match(hasEmotesRegex) && (!storage.haveNitro || !storage.forceMoji)) return;
 
 	// Find all emojis from the captured message string and return object with emojiURLS and content
 	const { newContent, extractedEmojis } = extractUnusableEmojis(msg.content, storage.emojiSize);