Drop nrelay, fix space threads

src/app/components/MenuSpaces.svelte

@@ -17,7 +17,7 @@
   import {
     GENERAL,
     userMembership,
-    decodeNRelay,
+    decodeRelay,
     getMembershipRoomsByUrl,
     getMembershipUrls,
     roomsByUrl,
@@ -25,7 +25,7 @@
   import {makeSpacePath} from "@app/routes"
   import {pushModal} from "@app/modal"
 
-  let space = $page.params?.nrelay ? decodeNRelay($page.params?.nrelay) : undefined
+  let space = $page.params?.relay ? decodeRelay($page.params?.relay) : undefined
   let showSettings = false
 
   const assertNotNil = <T,>(x: T) => x!

src/app/routes.ts

@@ -1,9 +1,9 @@
 import {nip19} from "nostr-tools"
 import type {Page} from "@sveltejs/kit"
-import {userMembership, makeChatId, decodeNRelay, getMembershipUrls} from "@app/state"
+import {userMembership, makeChatId, decodeRelay, encodeRelay, getMembershipUrls} from "@app/state"
 
 export const makeSpacePath = (url: string, extra = "") => {
-  let path = `/spaces/${nip19.nrelayEncode(url)}`
+  let path = `/spaces/${encodeRelay(url)}`
 
   if (extra) {
     path += "/" + encodeURIComponent(extra)
@@ -23,7 +23,7 @@ export const getPrimaryNavItemIndex = ($page: Page) => {
     case "discover":
       return urls.length + 2
     case "spaces": {
-      const routeUrl = decodeNRelay($page.params.nrelay)
+      const routeUrl = decodeRelay($page.params.relay)
 
       return urls.findIndex(url => url === routeUrl) + 1
     }

src/app/state.ts

@@ -31,6 +31,7 @@ import {
   asDecryptedEvent,
   isSignedEvent,
   hasValidSignature,
+  normalizeRelayUrl,
 } from "@welshman/util"
 import type {TrustedEvent, SignedEvent, PublishedList, List} from "@welshman/util"
 import {Nip59} from "@welshman/signer"
@@ -473,7 +474,9 @@ export const userMembership = withGetter(
 
 // Other utils
 
-export const decodeNRelay = (nevent: string) => nip19.decode(nevent).data as string
+export const encodeRelay = (url: string) => encodeURIComponent(normalizeRelayUrl(url))
+
+export const decodeRelay = (url: string) => normalizeRelayUrl(decodeURIComponent(url))
 
 export const displayReaction = (content: string) => {
   if (content === "+") return "❤️"