fix: Fix protocol handling

Myzel394 · Aug 17, 2023 · dd1a40b · dd1a40b
1 parent 5a00d03
commit dd1a40b
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 36 deletions.
diff --git a/lib/api/nostr-relays.dart b/lib/api/nostr-relays.dart
@@ -5,11 +5,13 @@ import "package:http/http.dart" as http;
 import 'package:locus/constants/apis.dart';
 import 'package:locus/constants/values.dart';
 
+import '../widgets/RelaySelectSheet.dart';
+
 final RELAY_FETCHER_FUNCTIONS = [
   NostrWatchAPI.getPublicNostrRelays,
   NostrBandAPI.getTrendingProfiles,
   NostrWatchAPI.getAllNostrRelays,
-      () => Future.value(FALLBACK_RELAYS),
+  () => Future.value(FALLBACK_RELAYS),
 ];
 
 // Tries each of the fallback relays until one works
@@ -73,40 +75,15 @@ class NostrBandAPI {
         List<dynamic>.from(jsonDecode(response.body)["profiles"])
             .map((e) => e["relays"])
             .expand((element) => element)
-            .toSet());
+            .toSet()
+            .map((element) {
+      final rawDomain = DOMAIN_REPLACE_REGEX.firstMatch(element);
+
+      if (rawDomain == null) {
+        return null;
+      }
+
+      return addProtocol(rawDomain.group(1)!);
+    }).where((element) => element != null));
   }
 }
-
-// Top 30 most used free relays
-const FALLBACK_RELAYS = [
-  "relay.damus.io",
-  "eden.nostr.land",
-  "nos.lol",
-  "relay.snort.social",
-  "relay.current.fyi",
-  "brb.io",
-  "nostr.orangepill.dev",
-  "nostr-pub.wellorder.net",
-  "nostr.bitcoiner.social",
-  "nostr.wine",
-  "nostr.oxtr.dev",
-  "relay.nostr.bg",
-  "nostr.mom",
-  "nostr.fmt.wiz.biz",
-  "relay.nostr.band",
-  "nostr-pub.semisol.dev",
-  "nostr.milou.lol",
-  "nostr.onsats.org",
-  "relay.nostr.info",
-  "puravida.nostr.land",
-  "offchain.pub",
-  "relay.orangepill.dev",
-  "no.str.cr",
-  "nostr.zebedee.cloud",
-  "atlas.nostr.land",
-  "nostr-relay.wlvs.space",
-  "relay.nostrati.com",
-  "relay.nostr.com.au",
-  "relay.inosta.cc",
-  "nostr.rocks",
-];
diff --git a/lib/constants/apis.dart b/lib/constants/apis.dart
@@ -1,4 +1,43 @@
+import 'package:locus/widgets/RelaySelectSheet.dart';
+
 const NOSTR_PUBLIC_RELAYS_LIST_URI = "https://api.nostr.watch/v1/public";
 const NOSTR_ONLINE_RELAYS_LIST_URI = "https://api.nostr.watch/v1/online";
 const NOSTR_TRENDING_PROFILES_URI =
     "https://api.nostr.band/v0/trending/profiles";
+
+// Top 30 most used free relays
+final FALLBACK_RELAYS = [
+  "relay.damus.io",
+  "eden.nostr.land",
+  "nos.lol",
+  "relay.snort.social",
+  "relay.current.fyi",
+  "brb.io",
+  "nostr.orangepill.dev",
+  "nostr-pub.wellorder.net",
+  "nostr.bitcoiner.social",
+  "nostr.wine",
+  "nostr.oxtr.dev",
+  "relay.nostr.bg",
+  "nostr.mom",
+  "nostr.fmt.wiz.biz",
+  "relay.nostr.band",
+  "nostr-pub.semisol.dev",
+  "nostr.milou.lol",
+  "nostr.onsats.org",
+  "relay.nostr.info",
+  "puravida.nostr.land",
+  "offchain.pub",
+  "relay.orangepill.dev",
+  "no.str.cr",
+  "nostr.zebedee.cloud",
+  "atlas.nostr.land",
+  "nostr-relay.wlvs.space",
+  "relay.nostrati.com",
+  "relay.nostr.com.au",
+  "relay.inosta.cc",
+  "nostr.rocks",
+].map(addProtocol).toList();
+
+// Strip everything after the domain for regex
+final DOMAIN_REPLACE_REGEX = RegExp(r"(wss:\/\/[-\w.]+)(?:\/.*)?");