why can a town name have fucking brackets??

src/api/squaremap/parser.ts

@@ -75,6 +75,8 @@ export const parsePopup = (popup: string): ParsedPopup => {
 
     const updatedPopup = popup.replace(/<span[^>]*>.*?<\/span>/, '<b>')
     const cleaned = striptags(updatedPopup.replaceAll('\n', ''), ['a']).trim()
+
+    // Keeping here in-case we should revert from regex.
     //const info = cleaned.split(/\s{2,}/)
 
     const townWiki = spanContent.match(/<a href="(.*)">(.*)<\/a> /)
@@ -85,8 +87,9 @@ export const parsePopup = (popup: string): ParsedPopup => {
 
     const residentsMatch = sectioned.match(/Residents: .*?\/\/(.*?)(?=\/\/|$)/)
     const residentsDetails = residentsMatch ? residentsMatch[1].trim() : null
-
-    const bracketMatch = spanContent.match(/^(.*?)\s*\((.*?)\)$/)
+
+    // Matches everything before last set of brackets, and everything inside last set of brackets.
+    const bracketMatch = spanContent.match(/^(.*)\s\(([^)]+)\)$/)
 
     //#region Extract town and nation
     const townStr = bracketMatch ? bracketMatch[1].trim() : spanContent.trim()

tests/oapi.test.ts

@@ -34,8 +34,6 @@ describe('[v3] OfficialAPI', async () => {
 
     it('can get valid player info', async () => {
         const players = await OfficialAPI.V3.players("af77d9b5-ab5d-4714-b92e-3b191c895ee7")
-
-        console.log(players)
 
         expect(players).toBeDefined()
         assertType<OAPIResident[]>(players)

tests/squaremap/gps.test.ts

@@ -0,0 +1,33 @@
+import { describe, it, expect } from 'vitest'
+import { Aurora } from '../../src/main'
+
+describe('[Squaremap/Aurora] GPS', () => {
+    const sampleLoc = { x: -8000, z: 100 }
+
+    it('can find the safest route', async () => {
+        const route = await Aurora.GPS.safestRoute(sampleLoc)
+
+        expect(route).toBeDefined()
+        expect(route.distance).toBeGreaterThanOrEqual(0)
+    })
+
+    it('can find the fastest route', async () => {
+        const route = await Aurora.GPS.fastestRoute(sampleLoc)
+
+        expect(route).toBeDefined()
+        expect(route.distance).toBeGreaterThanOrEqual(0)
+    })
+
+    // it('can check player is online when emitting', async () => {
+    //     const ops = await Nova.Players.online()
+    //     expect(ops).toBeDefined()
+    //     expect(ops).toBeTruthy()
+    //     assertType<Player[]>(ops)
+
+    //     const op = await Nova.Players.get(ops[0]['name'])
+    //     expect(op).toBeTruthy()
+
+    //     const online = await Nova.GPS.playerIsOnline(op)
+    //     expect(online).toEqual(true)
+    // })
+})

tests/squaremap/nations.test.ts

@@ -1,13 +1,19 @@
 import { describe, it, expect, expectTypeOf, assertType } from 'vitest'
 
-import type { Nation } from '../../src/types'
+import type { SquaremapNation } from '../../src/types'
 
 import { Aurora } from '../../src/main'
 
 describe('[Squaremap/Aurora] Nations', () => {
+    let nations: SquaremapNation[] = null
+
     it('can get all nations', async () => {
-        const nations = await Aurora.Nations.all()
-        assertType<Nation[]>(nations)
+        nations = await Aurora.Nations.all()
+        assertType<SquaremapNation[]>(nations)
+    })
+
+    it('has no nation with html tag in name', () => {
+        expect(nations.some(n => n.name.includes("</a>") || n.name.includes("<a>"))).toBe(false)
     })
 
     it('can get single nation', async () => {
@@ -17,7 +23,7 @@ describe('[Squaremap/Aurora] Nations', () => {
         expectTypeOf(nation).not.toEqualTypeOf<Error>
 
         //@ts-expect-error
-        assertType<Nation | Nation[]>(nation)
+        assertType<SquaremapNation | SquaremapNation[]>(nation)
 
         //@ts-ignore
         expect(nation.name).toBe('R.O.C')

tests/squaremap/towns.test.ts

@@ -8,11 +8,17 @@ import { SquaremapTown } from '../../src/types'
 import { Aurora } from '../../src/main'
 
 describe('[Squaremap/Aurora] Towns', () => {
+    let towns: SquaremapTown[] = null
+
     it('can get all towns', async () => {
-        const towns = await Aurora.Towns.all()
+        towns = await Aurora.Towns.all()
         assertType<SquaremapTown[]>(towns)
     })
 
+    it('has no town with html tag in name', () => {
+        expect(towns.some(t => t.name.includes("</a>") || t.name.includes("<a>"))).toBe(false)
+    })
+
     // TODO: Verify there are no duplicates residents.
     it('can get single town', async () => {
         const town = await Aurora.Towns.get('Hengyang')