Fix typos and refactor if-statement hell

acquitelol · Nov 26, 2023 · b3d27ab · b3d27ab
1 parent 818f7ab
commit b3d27ab
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -12,13 +12,13 @@
     <hr />
 - Extract the ZIP to a folder onto your local file system.
 - Open the **Manage Extensions** tab in your Chromium-based browser
-  - (This can be any browser ranging from `Chrome` to `Edge` to `Opera` to `Arc`).
+  - (This can be any browser ranging from `Chrome` to `Edge` to `Opera` to `Arc` to `Orion`).
   <hr />
 - *(Enable* ***Developer Mode*** *if not enabled already.)*
 - Click on **Load Unpacked**.
 - Select the **Azalea-(version)** directory.
   <hr />
-- **You're done!** Open/Refresh `Sparx` the extension should be installed! :D
+- **You're done!** Open/Refresh `Sparx` and the extension should be installed! :D
 
 <img src="extension/assets/divider.png">
 
@@ -49,7 +49,7 @@
 
   <hr />
 
-- Allows you to change the icon usd in Sparx by providing an image URL! (editable from **Menu > Settings**, off by default).
+- Allows you to change the icon used in Sparx by providing an image URL! (editable from **Menu > Settings**, off by default).
 
 <img src="extension/assets/divider.png">
 

diff --git a/src/loader/worker.ts b/src/loader/worker.ts
@@ -61,39 +61,40 @@ chrome.runtime.onMessage.addListener(async (message, sender) => {
         if (typeof message !== 'object') return;
         const { type, update, reset, local } = message;
 
-        if (type === 'inject-azalea') {
-            if (local) {
-                console.info('Loading bundle from local sources...');
-
-                const res = await fetch(chrome.runtime.getURL('bundle.js'))
-                    .then(r => r.text())
-                    .catch(() => {
-                        console.info('Bundle doesn\'t exist! Assuming enabling local mode was a mistake...')
-                    })
-
-                res && inject(sender.tab.id, res);
-            } else {
-                if (reset) {
-                    console.info('Clearing bundle and hash! Please wait...');
-                    await chrome.storage.local.set({ azaleaHash: null, azalea: null })
-                }
-
-                const loader = await fetch(chrome.runtime.getURL('loader.js')).then(r => r.text());
-                const { azalea } = await promisifiedGet('azalea');
-
-                if (azalea) {
-                    inject(
-                        sender.tab.id,
-                        loader.replace('INJECT_AZALEA_SOURCE', azalea),
-                    );
-                }
-
-                if (update) {
-                    console.info('Updates are disabled.')
-                } else {
-                    await updateAzalea(sender.tab.id);
-                }
-            }
+        if (type !== 'inject-azalea') return;
+
+        if (local) {
+            console.info('Loading bundle from local sources...');
+
+            const res = await fetch(chrome.runtime.getURL('bundle.js'))
+                .then(r => r.text())
+                .catch(() => {
+                    console.info('Bundle doesn\'t exist! Assuming enabling local mode was a mistake...')
+                })
+
+            res && inject(sender.tab.id, res);
+            return;
+        }
+
+        if (reset) {
+            console.info('Clearing bundle and hash! Please wait...');
+            await chrome.storage.local.set({ azaleaHash: null, azalea: null })
+        }
+
+        const loader = await fetch(chrome.runtime.getURL('loader.js')).then(r => r.text());
+        const { azalea } = await promisifiedGet('azalea');
+
+        if (azalea) {
+            inject(
+                sender.tab.id,
+                loader.replace('INJECT_AZALEA_SOURCE', azalea),
+            );
+        }
+
+        if (update) {
+            console.info('Updates are disabled.')
+        } else {
+            await updateAzalea(sender.tab.id);
         }
     } catch (e) {
         throw new Error('Failed to load Azalea: ' + e);