better nation matching

EarthMC-Toolkit · Jul 5, 2024 · a244b56 · a244b56
1 parent 6de04ec
commit a244b56
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/api/squaremap/parser.ts b/src/api/squaremap/parser.ts
@@ -47,8 +47,9 @@ export const parseTooltip = (tooltip: string) => {
 
     const out: ParsedTooltip = { town }
 
-    const nationMatch = cleaned.match(/\(.* of ([A-Za-z\u00C0-\u017F]+)\)/)
+    const nationMatch = cleaned.match(/\((?:.* of )?([A-Za-z\u00C0-\u017F_]+)\)/)
     const nation = nationMatch ? nationMatch[1] : null
+
     if (nation) out['nation'] = nation
 
     const indexClosingBracket = cleaned.indexOf(')')

diff --git a/tests/squaremap/nations.test.ts b/tests/squaremap/nations.test.ts
@@ -11,12 +11,15 @@ describe('[Squaremap/Aurora] Nations', () => {
     })
 
     it('can get single nation', async () => {
-        const nation = await Aurora.Nations.get('madagascar') as Nation
+        const nation = await Aurora.Nations.get('great_bulgaria')
 
         expect(nation).toBeTruthy()
         expectTypeOf(nation).not.toEqualTypeOf<Error>
+
+        //@ts-expect-error
         assertType<Nation | Nation[]>(nation)
 
-        expect(nation.name).toBe('Madagascar')
+        //@ts-ignore
+        expect(nation.name).toBe('Great_Bulgaria')
     })
 })
diff --git a/tests/squaremap/towns.test.ts b/tests/squaremap/towns.test.ts
@@ -15,7 +15,7 @@ describe('[Squaremap/Aurora] Towns', () => {
 
     // TODO: Verify there are no duplicates residents.
     it('can get single town', async () => {
-        const town = await Aurora.Towns.get('venice')
+        const town = await Aurora.Towns.get('fanagoria')
         expect(town).toBeTruthy()
         expect(town).toBeDefined()