Remove some poorly written tests

packages/app/src/commands.ts

@@ -9,40 +9,40 @@ export const unfollow = async (value: string) => {
   const list = get(userFollows) || makeList({kind: FOLLOWS})
   const event = await removeFromList(list, value).reconcile(nip44EncryptToSelf)
 
-  return publishThunk({event, relays: Router.getInstance().FromUser().getUrls()})
+  return publishThunk({event, relays: Router.get().FromUser().getUrls()})
 }
 
 export const follow = async (tag: string[]) => {
   const list = get(userFollows) || makeList({kind: FOLLOWS})
   const event = await addToListPublicly(list, tag).reconcile(nip44EncryptToSelf)
 
-  return publishThunk({event, relays: Router.getInstance().FromUser().getUrls()})
+  return publishThunk({event, relays: Router.get().FromUser().getUrls()})
 }
 
 export const unmute = async (value: string) => {
   const list = get(userMutes) || makeList({kind: MUTES})
   const event = await removeFromList(list, value).reconcile(nip44EncryptToSelf)
 
-  return publishThunk({event, relays: Router.getInstance().FromUser().getUrls()})
+  return publishThunk({event, relays: Router.get().FromUser().getUrls()})
 }
 
 export const mute = async (tag: string[]) => {
   const list = get(userMutes) || makeList({kind: MUTES})
   const event = await addToListPublicly(list, tag).reconcile(nip44EncryptToSelf)
 
-  return publishThunk({event, relays: Router.getInstance().FromUser().getUrls()})
+  return publishThunk({event, relays: Router.get().FromUser().getUrls()})
 }
 
 export const unpin = async (value: string) => {
   const list = get(userPins) || makeList({kind: PINS})
   const event = await removeFromList(list, value).reconcile(nip44EncryptToSelf)
 
-  return publishThunk({event, relays: Router.getInstance().FromUser().getUrls()})
+  return publishThunk({event, relays: Router.get().FromUser().getUrls()})
 }
 
 export const pin = async (tag: string[]) => {
   const list = get(userPins) || makeList({kind: PINS})
   const event = await addToListPublicly(list, tag).reconcile(nip44EncryptToSelf)
 
-  return publishThunk({event, relays: Router.getInstance().FromUser().getUrls()})
+  return publishThunk({event, relays: Router.get().FromUser().getUrls()})
 }

packages/app/src/feeds.ts

@@ -39,8 +39,8 @@ export const requestDVM = async ({kind, onEvent, ...request}: DVMOpts) => {
   const $signer = signer.get() || new Nip01Signer(makeSecret())
   const pubkey = await $signer.getPubkey()
   const relays = request.relays
-    ? Router.getInstance().FromRelays(request.relays).getUrls()
-    : Router.getInstance().FromPubkeys(getPubkeyTagValues(tags)).getUrls()
+    ? Router.get().FromRelays(request.relays).getUrls()
+    : Router.get().FromPubkeys(getPubkeyTagValues(tags)).getUrls()
 
   if (!tags.some(nthEq(0, "expiration"))) {
     tags.push(["expiration", String(now() + 60)])

packages/app/src/follows.ts

@@ -25,7 +25,7 @@ export const {
     await loadRelaySelections(pubkey, request)
 
     const filter = {kinds: [FOLLOWS], authors: [pubkey]}
-    const relays = Router.getInstance().FromPubkey(pubkey).getUrls()
+    const relays = Router.get().FromPubkey(pubkey).getUrls()
 
     await load({relays, ...request, filter})
   },

packages/app/src/mutes.ts

@@ -31,7 +31,7 @@ export const {
     await loadRelaySelections(pubkey, request)
 
     const filter = {kinds: [MUTES], authors: [pubkey]}
-    const relays = Router.getInstance().FromPubkey(pubkey).getUrls()
+    const relays = Router.get().FromPubkey(pubkey).getUrls()
 
     await load({relays, ...request, filter})
   },

packages/app/src/pins.ts

@@ -25,7 +25,7 @@ export const {
     await loadRelaySelections(pubkey, request)
 
     const filter = {kinds: [PINS], authors: [pubkey]}
-    const relays = Router.getInstance().FromPubkey(pubkey).getUrls()
+    const relays = Router.get().FromPubkey(pubkey).getUrls()
 
     await load({relays, ...request, filter})
   },

packages/app/src/profiles.ts

@@ -27,7 +27,7 @@ export const {
   load: async (pubkey: string, request: Partial<MultiRequestOptions> = {}) => {
     await loadRelaySelections(pubkey, request)
 
-    const router = Router.getInstance()
+    const router = Router.get()
     const filter = {kinds: [PROFILE], authors: [pubkey]}
     const relays = router.merge([router.Index(), router.FromPubkey(pubkey)]).getUrls()
 

packages/app/src/relaySelections.ts

@@ -48,7 +48,7 @@ export const {
   store: relaySelections,
   getKey: relaySelections => relaySelections.event.pubkey,
   load: async (pubkey: string, request: Partial<MultiRequestOptions> = {}) => {
-    const router = Router.getInstance()
+    const router = Router.get()
 
     await load({
       relays: router.merge([router.Index(), router.FromPubkey(pubkey)]).getUrls(),
@@ -73,7 +73,7 @@ export const {
   store: inboxRelaySelections,
   getKey: inboxRelaySelections => inboxRelaySelections.event.pubkey,
   load: async (pubkey: string, request: Partial<MultiRequestOptions> = {}) => {
-    const router = Router.getInstance()
+    const router = Router.get()
 
     await load({
       relays: router.merge([router.Index(), router.FromPubkey(pubkey)]).getUrls(),

packages/app/src/router.ts

@@ -194,7 +194,7 @@ export class Router {
     Object.assign(globalRouterOptions, options)
   }
 
-  static getInstance() {
+  static get() {
     return new Router(globalRouterOptions)
   }
 
@@ -422,7 +422,7 @@ export const getFilterSelectionsForSearch = (filter: Filter) => {
 
   const relays = globalRouterOptions.getSearchRelays?.() || []
 
-  return [{filter, scenario: Router.getInstance().FromRelays(relays).weight(10)}]
+  return [{filter, scenario: Router.get().FromRelays(relays).weight(10)}]
 }
 
 export const getFilterSelectionsForWraps = (filter: Filter) => {
@@ -431,7 +431,7 @@ export const getFilterSelectionsForWraps = (filter: Filter) => {
   return [
     {
       filter: {...filter, kinds: [WRAP]},
-      scenario: Router.getInstance().UserInbox(),
+      scenario: Router.get().UserInbox(),
     },
   ]
 }
@@ -446,7 +446,7 @@ export const getFilterSelectionsForIndexedKinds = (filter: Filter) => {
   return [
     {
       filter: {...filter, kinds},
-      scenario: Router.getInstance().FromRelays(relays),
+      scenario: Router.get().FromRelays(relays),
     },
   ]
 }
@@ -458,12 +458,12 @@ export const getFilterSelectionsForAuthors = (filter: Filter) => {
 
   return chunks(chunkCount, filter.authors).map(authors => ({
     filter: {...filter, authors},
-    scenario: Router.getInstance().FromPubkeys(authors),
+    scenario: Router.get().FromPubkeys(authors),
   }))
 }
 
 export const getFilterSelectionsForUser = (filter: Filter) => [
-  {filter, scenario: Router.getInstance().ForUser().weight(0.2)},
+  {filter, scenario: Router.get().ForUser().weight(0.2)},
 ]
 
 export const defaultFilterSelectionRules = [
@@ -493,7 +493,7 @@ export const getFilterSelections = (
   const result = []
 
   for (const [id, filter] of filtersById.entries()) {
-    const scenario = Router.getInstance().merge(scenariosById.get(id) || [])
+    const scenario = Router.get().merge(scenariosById.get(id) || [])
 
     result.push({filters: [filter], relays: scenario.getUrls()})
   }

packages/app/src/search.ts

@@ -56,7 +56,7 @@ export const searchProfiles = debounce(500, (search: string) => {
   if (search.length > 2) {
     load({
       filter: {kinds: [PROFILE], search},
-      relays: Router.getInstance().Search().getUrls(),
+      relays: Router.get().Search().getUrls(),
     })
   }
 })

packages/app/src/tags.ts

@@ -14,19 +14,19 @@ import {Router} from "./router.js"
 export const tagZapSplit = (pubkey: string, split = 1) => [
   "zap",
   pubkey,
-  Router.getInstance().FromPubkey(pubkey).getUrl(),
+  Router.get().FromPubkey(pubkey).getUrl(),
   String(split),
 ]
 
 export const tagPubkey = (pubkey: string, ...args: unknown[]) => [
   "p",
   pubkey,
-  Router.getInstance().FromPubkey(pubkey).getUrl(),
+  Router.get().FromPubkey(pubkey).getUrl(),
   displayProfileByPubkey(pubkey),
 ]
 
 export const tagEvent = (event: TrustedEvent, mark = "") => {
-  const url = Router.getInstance().Event(event).getUrl()
+  const url = Router.get().Event(event).getUrl()
   const tags = [["e", event.id, url, mark, event.pubkey]]
 
   if (isReplaceable(event)) {
@@ -42,7 +42,7 @@ export const tagEventPubkeys = (event: TrustedEvent) =>
 export const tagEventForQuote = (event: TrustedEvent) => [
   "q",
   event.id,
-  Router.getInstance().Event(event).getUrl(),
+  Router.get().Event(event).getUrl(),
   event.pubkey,
 ]
 
@@ -55,11 +55,11 @@ export const tagEventForReply = (event: TrustedEvent) => {
   // Root comes first
   if (roots.length > 0) {
     for (const t of roots) {
-      tags.push([...t.slice(0, 2), Router.getInstance().EventRoots(event).getUrl(), "root"])
+      tags.push([...t.slice(0, 2), Router.get().EventRoots(event).getUrl(), "root"])
     }
   } else {
     for (const t of replies) {
-      tags.push([...t.slice(0, 2), Router.getInstance().EventParents(event).getUrl(), "root"])
+      tags.push([...t.slice(0, 2), Router.get().EventParents(event).getUrl(), "root"])
     }
   }
 
@@ -81,7 +81,7 @@ export const tagEventForReply = (event: TrustedEvent) => {
 
   // Finally, tag the event itself
   const mark = replies.length > 0 ? "reply" : "root"
-  const hint = Router.getInstance().Event(event).getUrl()
+  const hint = Router.get().Event(event).getUrl()
 
   // e-tag the event
   tags.push(["e", event.id, hint, mark, event.pubkey])
@@ -95,8 +95,8 @@ export const tagEventForReply = (event: TrustedEvent) => {
 }
 
 export const tagEventForComment = (event: TrustedEvent) => {
-  const pubkeyHint = Router.getInstance().FromPubkey(event.pubkey).getUrl()
-  const eventHint = Router.getInstance().Event(event).getUrl()
+  const pubkeyHint = Router.get().FromPubkey(event.pubkey).getUrl()
+  const eventHint = Router.get().Event(event).getUrl()
   const address = getAddress(event)
   const seenRoots = new Set<string>()
   const tags: string[][] = []
@@ -130,7 +130,7 @@ export const tagEventForComment = (event: TrustedEvent) => {
 }
 
 export const tagEventForReaction = (event: TrustedEvent) => {
-  const hint = Router.getInstance().Event(event).getUrl()
+  const hint = Router.get().Event(event).getUrl()
   const tags: string[][] = []
 
   // Mention the event's author