From 0617a8ed5709972df2d17c6053a9173fd2da469a Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Sun, 24 Nov 2024 15:12:23 -0500
Subject: Fix icon sorting and refactor getBrowser

---
 extension/public/background.js  |  6 +-----
 extension/public/iconGrabber.js | 15 ++++++++-------
 extension/src/main.tsx          |  6 +-----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/extension/public/background.js b/extension/public/background.js
index 15c50ba..c3ee421 100644
--- a/extension/public/background.js
+++ b/extension/public/background.js
@@ -1,9 +1,5 @@
 function getBrowser() {
-    if (typeof browser === "undefined") {
-        return chrome;
-    } else {
-        return browser;
-    }
+    return typeof browser === "undefined" ? chrome : browser;
 }
 
 getBrowser().runtime.onMessage.addListener(async (request, sender, sendResponse) => {
diff --git a/extension/public/iconGrabber.js b/extension/public/iconGrabber.js
index a255d01..b02e315 100644
--- a/extension/public/iconGrabber.js
+++ b/extension/public/iconGrabber.js
@@ -1,9 +1,5 @@
 function getBrowser() {
-    if (typeof browser === "undefined") {
-        return chrome;
-    } else {
-        return browser;
-    }
+    return typeof browser === "undefined" ? chrome : browser;
 }
 
 const tagTypes = ["apple-touch-icon", "shortcut icon", "icon"]
@@ -12,11 +8,16 @@ let x = Array.from(document.getElementsByTagName("link"))
     .filter(elem => tagTypes.includes(elem.rel))
     .sort((a, b) => {
         function compareTags() {
+            // ascending
             return tagTypes.indexOf(a.rel) - tagTypes.indexOf(b.rel);
         }
         function compareSizes() {
-            try { return Number(b.sizes[0].split('x')[0]) - Number(a.sizes[0].split('x')[0]); }
-            catch { return -1; }
+            function getSize(elem) {
+                try { return Number(elem.sizes[0].split('x')[0]); }
+                catch { return 0; }
+            }
+            // descending
+            return getSize(b) - getSize(a);
         }
 
         return compareSizes() || compareTags()
diff --git a/extension/src/main.tsx b/extension/src/main.tsx
index 40cc4f4..2505023 100644
--- a/extension/src/main.tsx
+++ b/extension/src/main.tsx
@@ -3,11 +3,7 @@ import './index.css'
 import Body from "./components/Body.tsx";
 
 export function getBrowser() {
-    if (typeof browser === "undefined") {
-        return chrome;
-    } else {
-        return browser;
-    }
+    return typeof browser === "undefined" ? chrome : browser;
 }
 //
 // getBrowser().runtime.onMessage.addListener((message) => {
-- 
cgit v1.2.3