Revert "feat: nip-66 relay status fetching"

This reverts commit 1d47dfe.

apps/badges/app/layout.tsx

@@ -1,5 +1,5 @@
 export const metadata = {
-  metadataBase: new URL("https://badges.page"),
+  metadataBase: new URL('https://badges.page'),
   title: "Badges",
   description: "Create, collect and award badges",
 };

apps/emojis/app/utils.ts

@@ -0,0 +1,33 @@
+import { Relay, Tag } from "@ngine/core";
+
+export function encodeRelayURL(url: string): string {
+  url = url.trim();
+  if (url.startsWith("wss://")) {
+    url = url.slice(6);
+  }
+  return encodeURIComponent(url);
+}
+
+export function relayToTag(r: Relay): Tag {
+  if (r.read && !r.write) {
+    return ["r", r.url, "read"];
+  }
+  if (r.write && !r.read) {
+    return ["r", r.url, "write"];
+  }
+  return ["r", r.url];
+}
+
+export function tagToRelay(t: Tag): Relay {
+  const url = t[1].replace(/\/$/, "");
+
+  if (t[2] === "read") {
+    return { url, read: true, write: false };
+  }
+
+  if (t[2] === "write") {
+    return { url, read: false, write: true };
+  }
+
+  return { url, read: true, write: true };
+}

apps/emojis/ui/layout.tsx

@@ -15,11 +15,7 @@ import { theme } from "./theme";
 
 const cacheAdapter = new NDKCacheAdapterDexie({ dbName: "emojis" });
 const ndk = new NDK({
-  explicitRelayUrls: [
-    "wss://nos.lol",
-    "wss://relay.nostr.band",
-    "wss://frens.nostr1.com",
-  ],
+  explicitRelayUrls: ["wss://nos.lol", "wss://relay.nostr.band", "wss://frens.nostr1.com"],
   outboxRelayUrls: ["wss://purplepag.es"],
   enableOutboxModel: true,
   cacheAdapter,

apps/relays/app/components/footer.tsx

@@ -13,9 +13,9 @@ export default function Footer(props: StackProps) {
       {...props}
     >
       <Text color="chakra-subtle-text">
-        Relay data provided by
-        <Link variant="brand" href="https://nostr.watch">
-          nostr.watch
+        Made with ❤️ by{" "}
+        <Link variant="brand" href="https://snort.social/verbiricha">
+          verbiricha
         </Link>
       </Text>
       <Text color="chakra-subtle-text">

apps/relays/app/components/relay-link.tsx

@@ -5,20 +5,19 @@ import { useRelays } from "@ngine/core";
 
 import Link from "./link";
 import RelayFavicon from "./relay-favicon";
-import { humanize, encode } from "@lib/urls";
+import { encodeRelayURL } from "../utils";
 
 interface RelayLinkProps {
   url: string;
 }
 
 export default function RelayLink({ url }: RelayLinkProps) {
   const relays = useRelays();
-  const isInMyRelays = useMemo(
-    () => relays.map(humanize).includes(humanize(url)),
-    [relays, url],
-  );
-  const encoded = useMemo(() => `/relay/${encode(url)}`, [url]);
-  const domain = useMemo(() => humanize(url), [url]);
+  const isInMyRelays = useMemo(() => relays.includes(url), [relays, url]);
+  const encoded = useMemo(() => `/relay/${encodeRelayURL(url)}`, [url]);
+  const domain = useMemo(() => {
+    return url.replace("ws://", "").replace("wss://", "");
+  }, [url]);
   return (
     <Link key={url} href={encoded}>
       <HStack spacing={2}>

apps/relays/app/components/relay-metadata.tsx

@@ -7,7 +7,6 @@ import RelayFavicon from "./relay-favicon";
 import RelaySummary from "./relay-summary";
 import ToggleRelay from "./toggle-relay";
 import { RelayMetadata } from "../hooks/useRelayMetadata";
-import { humanize } from "@lib/urls";
 
 export default function Metadata({
   url,
@@ -16,7 +15,9 @@ export default function Metadata({
   url: string;
   metadata: RelayMetadata;
 }) {
-  const domain = useMemo(() => humanize(url), [url]);
+  const domain = useMemo(() => {
+    return url.replace("ws://", "").replace("wss://", "");
+  }, [url]);
 
   return (
     <Stack>

apps/relays/app/components/relays.tsx

@@ -3,73 +3,58 @@
 import { useRouter } from "next/navigation";
 import { useState, useMemo } from "react";
 import {
+  Alert,
+  AlertIcon,
   Stack,
   Button,
+  Text,
   Icon,
   Input,
   InputGroup,
   InputLeftElement,
   InputRightElement,
-  Stat,
-  StatLabel,
-  StatNumber,
-  StatGroup,
 } from "@chakra-ui/react";
+import { useQuery } from "@tanstack/react-query";
 import { useIntl, FormattedMessage } from "react-intl";
 import { useRelays } from "@ngine/core";
 
 import RelayLink from "./relay-link";
 import RelayIcon from "./relay-icon";
-import { humanize, encode } from "@lib/urls";
-import useRelayStatus from "@hooks/useRelayStatus";
+import { encodeRelayURL } from "../utils";
 
 export default function Relays() {
   const { formatMessage } = useIntl();
   const router = useRouter();
   const [relay, setRelay] = useState("");
-  const { events, online, offline } = useRelayStatus();
   const myRelays = useRelays();
-  const relaySet = useMemo(() => new Set(myRelays.map(humanize)), [myRelays]);
+  const { data, isFetched, isError } = useQuery({
+    queryKey: ["relays"],
+    queryFn: () =>
+      fetch(`https://api.nostr.watch/v1/online`).then((r) => r.json()),
+  });
 
   function relayScore(url: string) {
-    if (relaySet.has(humanize(url))) {
-      return 42;
+    if (myRelays.includes(url)) {
+      return 1;
     }
     return 0;
   }
 
   const relays = useMemo(() => {
-    const raw = [...online].sort((a, b) => relayScore(b) - relayScore(a));
+    const raw = data
+      ? [...data].sort((a, b) => relayScore(b) - relayScore(a))
+      : [];
     return raw
       .filter((url) => url.toLowerCase().includes(relay.toLowerCase()))
       .slice(0, 21);
-  }, [online, relay]);
+  }, [relay, data, myRelays]);
 
   function goToRelay(url: string) {
-    router.push(`/relay/${encode(url)}`);
+    router.push(`/relay/${encodeRelayURL(url)}`);
   }
 
   return (
     <Stack spacing={4} w="100%">
-      <StatGroup>
-        {/* @ts-ignore */}
-        <Stat align="center">
-          <StatNumber>{events.length}</StatNumber>
-          <StatLabel>Relays</StatLabel>
-        </Stat>
-
-        {/* @ts-ignore */}
-        <Stat align="center">
-          <StatNumber>{online.length}</StatNumber>
-          <StatLabel>Online</StatLabel>
-        </Stat>
-
-        {/* @ts-ignore */}
-        <Stat align="center">
-          <StatNumber>{offline.length}</StatNumber>
-          <StatLabel>Offline</StatLabel>
-        </Stat>
-      </StatGroup>
       <InputGroup>
         <InputLeftElement
           pointerEvents="none"
@@ -108,9 +93,28 @@ export default function Relays() {
         </InputRightElement>
       </InputGroup>
       <Stack>
-        {relays.map((url) => (
-          <RelayLink key={url} url={url} />
-        ))}
+        {isError && (
+          <Alert>
+            <AlertIcon />
+            <FormattedMessage
+              id="cant-fetch-relays"
+              description="Error message shown when can't fetch online relays"
+              defaultMessage="Could not fetch online relays"
+            />
+          </Alert>
+        )}
+        {isFetched &&
+          relays.map((url: string) => <RelayLink key={url} url={url} />)}
+        {isFetched && relays.length === 0 && (
+          <Text color="chakra-subtle-text">
+            <FormattedMessage
+              id="no-relays-found"
+              description="Message shown when no known relay matches the search pattern"
+              defaultMessage="No relays match the term `{ relay }`"
+              values={{ relay }}
+            />
+          </Text>
+        )}
       </Stack>
     </Stack>
   );

apps/relays/app/utils.ts

@@ -19,7 +19,7 @@ export function relayToTag(r: Relay): Tag {
 }
 
 export function tagToRelay(t: Tag): Relay {
-  const url = t[1];
+  const url = t[1].replace(/\/$/, "");
 
   if (t[2] === "read") {
     return { url, read: true, write: false };

apps/relays/tsconfig.json

@@ -16,8 +16,6 @@
     "baseUrl": "./",
     "paths": {
       "@ui/*": ["ui/*"],
-      "@hooks/*": ["hooks/*"],
-      "@lib/*": ["lib/*"],
     }
   },
   "include": [

packages/core/src/state.ts

@@ -18,7 +18,7 @@ export const relaysAtom = atom<Relay[]>((get) => {
     relayList?.tags
       .filter((t) => t[0] === "r")
       .map((t) => {
-        const url = t[1];
+        const url = t[1].replace(/\/$/, "");
         const read = t.length === 2 || t[2] === "read";
         const write = t.length === 2 || t[2] === "write";
         return { url, read, write };