Update mainHost

AlttiRi · Jun 21, 2024 · 7ba934e · 7ba934e
1 parent cc75007
commit 7ba934e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/dist/href-taker.user.js b/dist/href-taker.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name        HrefTaker
-// @version     0.12.3-2024.6.21-063a
+// @version     0.12.4-2024.6.21-1560
 // @namespace   gh.alttiri
 // @description URL grabber popup
 // @license     GPL-3.0
@@ -600,7 +600,18 @@ function storeStateInLS({id: lsName, onMove, onStop, reset, restore}) {
 function getListHelper(container, settings) {
     const headerElem  = container.querySelector(`#result-list-header`);
     const contentElem = container.querySelector(`#result-list`);
-    const mainHost = url => new URL(url).hostname.split(".").slice(-2).join(".");
+    /**
+     * @param {string} url
+     * @return {string}
+     */
+    const mainHost = url => {
+        try {
+            return new URL(url).hostname.split(".").slice(-2).join(".");
+        } catch (e) {
+            console.error(url, e);
+            return "";
+        }
+    };
 
     contentElem.addEventListener("click", onClickMarkUrlAsClicked);
     contentElem.addEventListener("contextmenu", onAltContextMenuUnmarkClickedUrl);
@@ -704,14 +715,10 @@ function getListHelper(container, settings) {
             for (const url of urls) {
                 let linkHtml = urlToHtml(url);
                 if (settings.sort) {
-                    try {
-                        if (mainHost(prev) !== mainHost(url)) {
-                            resultHtml += `<span class="url-pad"></span>`;
-                        }
-                        prev = url;
-                    } catch (e) {
-                        console.error(url, e);
+                    if (mainHost(prev) !== mainHost(url)) {
+                        resultHtml += `<span class="url-pad"></span>`;
                     }
+                    prev = url;
                 }
                 const clicked = clickedUrls.has(url) ? " clicked" : "";
                 const html = `<div class="url-item${clicked}"><a href="${url}" ${anchorAttr}>${linkHtml}</a></div>`;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "href-taker",
   "private": true,
-  "version": "0.12.3-2024.6.21-063a",
+  "version": "0.12.4-2024.6.21-1560",
   "type": "module",
   "scripts": {
     "dev": "vite --open demo.html --host",

diff --git a/src/components/list-helper.js b/src/components/list-helper.js
@@ -7,7 +7,18 @@ import {hashString} from "../util.js";
 export function getListHelper(container, settings) {
     const headerElem  = container.querySelector(`#result-list-header`);
     const contentElem = container.querySelector(`#result-list`);
-    const mainHost = url => new URL(url).hostname.split(".").slice(-2).join(".");
+    /**
+     * @param {string} url
+     * @return {string}
+     */
+    const mainHost = url => {
+        try {
+            return new URL(url).hostname.split(".").slice(-2).join(".");
+        } catch (e) {
+            console.error(url, e);
+            return "";
+        }
+    };
 
     contentElem.addEventListener("click", onClickMarkUrlAsClicked);
     contentElem.addEventListener("contextmenu", onAltContextMenuUnmarkClickedUrl);
@@ -111,14 +122,10 @@ export function getListHelper(container, settings) {
             for (const url of urls) {
                 let linkHtml = urlToHtml(url);
                 if (settings.sort) {
-                    try {
-                        if (mainHost(prev) !== mainHost(url)) {
-                            resultHtml += `<span class="url-pad"></span>`;
-                        }
-                        prev = url;
-                    } catch (e) {
-                        console.error(url, e);
+                    if (mainHost(prev) !== mainHost(url)) {
+                        resultHtml += `<span class="url-pad"></span>`;
                     }
+                    prev = url;
                 }
                 const clicked = clickedUrls.has(url) ? " clicked" : "";
                 const html = `<div class="url-item${clicked}"><a href="${url}" ${anchorAttr}>${linkHtml}</a></div>`;