From a9429b7e628440ce7a4897a2002ec77c4109989d Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Fri, 16 May 2025 14:32:56 +0300
Subject: [PATCH 1/2] drop `TUBA_SKIP_STRICT_VALIDATION`, optimize Uri filter

---
 src/Dialogs/NewAccount.vala | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/Dialogs/NewAccount.vala b/src/Dialogs/NewAccount.vala
index 09190635e..4a436fa55 100644
--- a/src/Dialogs/NewAccount.vala
+++ b/src/Dialogs/NewAccount.vala
@@ -131,48 +131,29 @@ public class Tuba.Dialogs.NewAccount: Adw.Window {
 	}
 
 	void setup_instance () throws Error {
-		bool skip_strict_validation = GLib.Environment.get_variable ("TUBA_SKIP_STRICT_VALIDATION") == "1";
-		debug ("Checking instance URL (strict: %s)", skip_strict_validation.to_string ());
-
 		string final_string = instance_entry.text;
 		if (!final_string.contains ("://")) final_string = @"https://$final_string";
 
 		string final_string_no_scheme = final_string;
 		try {
 			GLib.Uri instance_uri = GLib.Uri.parse (final_string, GLib.UriFlags.NONE);
-			string scheme = instance_uri.get_scheme ();
-			string host = instance_uri.get_host ();
-			int port = instance_uri.get_port ();
-			string? userinfo = instance_uri.get_userinfo ();
-
-			if (!skip_strict_validation) {
-				scheme = "https";
-				port = -1;
-				userinfo = null;
-
-				if (!host.contains (".")) {
-					throw new Error.literal (-1, 1, @"Host '$host' is missing a dot");
-				}
-			}
-
-			final_string_no_scheme = GLib.Uri.build (
+			final_string = GLib.Uri.build (
 				instance_uri.get_flags (),
-				"",
-				userinfo,
-				host,
-				port,
+				instance_uri.get_scheme (),
+				instance_uri.get_userinfo (),
+				instance_uri.get_host (),
+				instance_uri.get_port (),
 				"",
 				null,
 				null
-			).to_string ().substring (3);
-			final_string = @"$scheme://$final_string_no_scheme";
+			).to_string ();
 		} catch (Error e) {
 			warning ("Couldn't parse instance URI: %s", e.message);
 			throw new Oopsie.USER (_("Please enter a valid instance URL"));
 		}
 
 		account.instance = final_string;
-		instance_entry.text = final_string_no_scheme;
+		instance_entry.text = final_string;
 	}
 
 	async void register_client () throws Error {

From a7450f0949f410a00907a753d750dfe7762088ca Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Fri, 16 May 2025 14:45:13 +0300
Subject: [PATCH 2/2] remove deprecated extra line

---
 src/Dialogs/NewAccount.vala | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Dialogs/NewAccount.vala b/src/Dialogs/NewAccount.vala
index 4a436fa55..e34eaa003 100644
--- a/src/Dialogs/NewAccount.vala
+++ b/src/Dialogs/NewAccount.vala
@@ -134,7 +134,6 @@ public class Tuba.Dialogs.NewAccount: Adw.Window {
 		string final_string = instance_entry.text;
 		if (!final_string.contains ("://")) final_string = @"https://$final_string";
 
-		string final_string_no_scheme = final_string;
 		try {
 			GLib.Uri instance_uri = GLib.Uri.parse (final_string, GLib.UriFlags.NONE);
 			final_string = GLib.Uri.build (