Mirror/vega
1
0
Fork 0
mirror of https://github.com/hoornet/vega.git synced 2026-05-07 04:39:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix relay dedup: normalize URLs to prevent trailing-slash duplicates

Browse Source
This commit is contained in:
Jure
2026-03-31 06:45:55 +02:00
parent f2d51fba31
commit 91ddfddf53
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/shared/RelaysView.tsx
View File

@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { getNDK, getStoredRelayUrls, addRelay, removeRelay, publishRelayList, fetchRelayRecommendations } from "../../lib/nostr";
import { getNDK, getStoredRelayUrls, addRelay, removeRelay, publishRelayList, fetchRelayRecommendations, normalizeRelayUrl } from "../../lib/nostr";
import { useRelayHealthStore } from "../../stores/relayHealth";
import { useUserStore } from "../../stores/user";
import type { RelayHealthResult } from "../../lib/nostr/relayHealth";
@@ -154,7 +154,7 @@ export function RelaysView() {
const { loggedIn } = useUserStore();
const ndk = getNDK();
const poolRelays = Array.from(ndk.pool?.relays?.values() ?? []);
const poolConnectedUrls = new Set(poolRelays.filter((r) => r.connected).map((r) => r.url));
const poolConnectedUrls = new Set(poolRelays.filter((r) => r.connected).map((r) => normalizeRelayUrl(r.url)));
const [input, setInput] = useState("");
const [addError, setAddError] = useState<string | null>(null);
@@ -180,7 +180,7 @@ export function RelaysView() {
setAddError("URL must start with ws:// or wss://");
return;
}
if (getStoredRelayUrls().includes(url)) {
if (getStoredRelayUrls().includes(normalizeRelayUrl(url))) {
setAddError("Already in list");
return;
}
@@ -218,8 +218,8 @@ export function RelaysView() {
};
// Merge: show health results first, then any pool relays not yet checked
const checkedUrls = new Set(results.map((r) => r.url));
const uncheckedPoolRelays = poolRelays.filter((r) => !checkedUrls.has(r.url));
const checkedUrls = new Set(results.map((r) => normalizeRelayUrl(r.url)));
const uncheckedPoolRelays = poolRelays.filter((r) => !checkedUrls.has(normalizeRelayUrl(r.url)));
// Sort: online first, then slow, then offline
const sortedResults = [...results].sort((a, b) => {