From 23fdf5ab07f593f4a94abdcf4cd771fda479a37d Mon Sep 17 00:00:00 2001
From: Nikita Karamov <me@kytta.dev>
Date: Mon, 27 Mar 2023 21:23:49 +0200
Subject: [PATCH] Re-implement domain normalization

---
 src/components/instance-select.astro |  4 ++--
 src/scripts/util.ts                  | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/instance-select.astro b/src/components/instance-select.astro
index a4dc63f..ddb39b9 100644
--- a/src/components/instance-select.astro
+++ b/src/components/instance-select.astro
@@ -65,7 +65,7 @@ const { prefilledInstance } = Astro.props;
 </style>
 
 <script>
-	import { extractHost, normalizeURL } from "@scripts/util";
+	import { getUrlDomain, normalizeURL } from "@scripts/util";
 	import {
 		savedInstances as instanceStore,
 		saveInstance,
@@ -88,7 +88,7 @@ const { prefilledInstance } = Astro.props;
 						return [];
 					}
 
-					const host = extractHost(instance);
+					const host = getUrlDomain(instance);
 					if (index == 0 && !$instance.value) {
 						$instance.value = host;
 					}
diff --git a/src/scripts/util.ts b/src/scripts/util.ts
index a793150..2d463fc 100644
--- a/src/scripts/util.ts
+++ b/src/scripts/util.ts
@@ -19,9 +19,14 @@ export const normalizeURL = (url: string): string => {
 	return url;
 };
 
-export const extractHost = (url: string): string => {
-	if (!(url.startsWith("https://") || url.startsWith("http://"))) {
-		url = "https://" + url;
+export const getUrlDomain = (url: string | URL): string => {
+	if (typeof url === "string") {
+		url = url.trim();
+
+		if (!/^https?:\/\//.test(url)) {
+			url = `https://${url}`;
+		}
 	}
+
 	return new URL(url).host;
 };