parse wiki :P

EarthMC-Toolkit · Jun 24, 2024 · 1625e0f · 1625e0f
1 parent 11d5fb7
commit 1625e0f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/api/squaremap/parser.ts b/src/api/squaremap/parser.ts
@@ -77,10 +77,11 @@ export const parseTowns = async(res: SquaremapMarkerset, removeAccents = false)
         }
 
         const townName = parsedTooltip[0]
+        const nationName = parsedTooltip[1] ? formatString(parsedTooltip[1], removeAccents) : "No Nation"
 
         const town: SquaremapTown = {
             name: formatString(townName, removeAccents),
-            nation: parsedTooltip[1] ? formatString(parsedTooltip[1], removeAccents) : "No Nation",
+            nation: nationName,
             mayor: parseInfoString(info[1]),
             assistants, 
             residents,
@@ -106,6 +107,14 @@ export const parseTowns = async(res: SquaremapMarkerset, removeAccents = false)
             }
         }
 
+        //#region Parse wiki and add to town if it exists.
+        const match = info[0].match(/href="([^"]*)"/)
+        const wikiLink = match ? match[1] : null
+
+        if (wikiLink) 
+            town['wiki'] = wikiLink
+        //#endregion
+
         towns.push(town)
     }
 
@@ -148,7 +157,7 @@ export const parseNations = async(towns: SquaremapTown[]) => {
             raw[nationName].towns?.push(town.name)
 
         if (town.flags.capital) {
-            //if (town.wiki) raw[nationName].wiki = town.wiki
+            if (town.wiki) raw[nationName].wiki = town.wiki
 
             raw[nationName].king = town.mayor
             raw[nationName].capital = {

diff --git a/tests/squaremap/nations.test.ts b/tests/squaremap/nations.test.ts
@@ -14,10 +14,9 @@ describe('[Squaremap/Aurora] Nations', () => {
         const nation = await Aurora.Nations.get('madagascar')
 
         expect(nation).toBeDefined()
-        expectTypeOf(nation).not.toEqualTypeOf<Error>()
+        expectTypeOf(nation).not.toEqualTypeOf<Error>
         assertType<Nation | Nation[]>(nation)
 
         expect(nation.name).toBe('Madagascar')
-        //console.log(nation.residents.length)
     })
 })
diff --git a/tests/squaremap/towns.test.ts b/tests/squaremap/towns.test.ts
@@ -14,7 +14,7 @@ describe('[Squaremap/Aurora] Towns', () => {
     })
 
     it('can get single town', async () => {
-        const town = await Aurora.Towns.get('brisbane')
+        const town = await Aurora.Towns.get('Morven')
 
         expect(town).toBeTruthy()
         expect(town).toBeDefined()