From 620440e2a102b7a724b12813b3327d3ea40371a8 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Mon, 10 Aug 2026 22:50:13 -0400
Subject: [PATCH] Allow logging into homeservers without discovery working

---
 lib/controllers/client.dart  |  2 +-
 lib/pages/select_server.dart | 56 ++++++++++++++++++++++++------------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart
index e31e4f3..33af1b5 100644
--- a/lib/controllers/client.dart
+++ b/lib/controllers/client.dart
@@ -311,7 +311,7 @@ class ClientController extends AsyncNotifier<int> {
   Future<Uri?> discoverHomeserver(Uri homeserver) async {
     try {
       final response = await _sendCommand("discover_homeserver", {
-        "user_id": "@fake-user:${homeserver.host}",
+        "user_id": "@fake-user:${homeserver.authority}",
       });
       return Uri.parse(response["m.homeserver"]?["base_url"]);
     } catch (error) {
diff --git a/lib/pages/select_server.dart b/lib/pages/select_server.dart
index 853e5fc..e8e689b 100644
--- a/lib/pages/select_server.dart
+++ b/lib/pages/select_server.dart
@@ -26,6 +26,17 @@ class SelectServerPage extends HookConsumerWidget {
     final homeserverUrl = useTextEditingController();
 
     Future<void> setHomeserver(Uri? newHomeserver) async {
+      if (newHomeserver == null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              "Failed to parse homeserver URL. Are you sure you typed it correctly?",
+              style: .new(color: theme.colorScheme.onErrorContainer),
+            ),
+            backgroundColor: theme.colorScheme.errorContainer,
+          ),
+        );
+      }
       isLoading.value = true;
 
       try {
@@ -33,26 +44,14 @@ class SelectServerPage extends HookConsumerWidget {
           newHomeserver = Uri.https(newHomeserver!.path);
         }
 
-        final newUrl = newHomeserver == null
-            ? null
-            : await ref
-                  .read(ClientController.provider.notifier)
-                  .discoverHomeserver(newHomeserver);
+        final newUrl = await ref
+            .read(ClientController.provider.notifier)
+            .discoverHomeserver(newHomeserver!);
 
         if (context.mounted) {
-          if (newUrl == null) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text(
-                  "Homeserver verification failed. Is your homeserver down?",
-                  style: .new(color: theme.colorScheme.onErrorContainer),
-                ),
-                backgroundColor: theme.colorScheme.errorContainer,
-              ),
-            );
-          } else {
+          Future<void> tryLogin(Uri url) async {
             final codeResponse = await ref.watch(
-              AuthUrlController.provider(newUrl).future,
+              AuthUrlController.provider(url).future,
             );
 
             await ref.watch(LaunchHelper.provider).launchUrl(codeResponse.url);
@@ -70,7 +69,7 @@ class SelectServerPage extends HookConsumerWidget {
                       .watch(ClientController.provider.notifier)
                       .exchangeToken(
                         .new(
-                          homeserverUrl: newUrl,
+                          homeserverUrl: url,
                           codeVerifier: codeResponse.codeVerifier,
                           redirectUri: .new(
                             scheme: "nexus.federated.nexus",
@@ -78,7 +77,7 @@ class SelectServerPage extends HookConsumerWidget {
                           ),
                           code: code,
                           clientId: await ref.watch(
-                            ClientIdController.provider(newUrl).future,
+                            ClientIdController.provider(url).future,
                           ),
                         ),
                       )
@@ -89,6 +88,25 @@ class SelectServerPage extends HookConsumerWidget {
               }
             });
           }
+
+          if (newUrl == null) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(
+                  "Homeserver verification failed.",
+                  style: .new(color: theme.colorScheme.onErrorContainer),
+                ),
+                action: SnackBarAction(
+                  onPressed: () => tryLogin(newHomeserver!),
+                  label: "Attempt log in anyways",
+                  textColor: theme.colorScheme.onErrorContainer,
+                ),
+                backgroundColor: theme.colorScheme.errorContainer,
+              ),
+            );
+          } else {
+            tryLogin(newUrl);
+          }
         }
       } catch (error, stackTrace) {
         showError(error, stackTrace);