fix: handle color and icon codes in player names

Author: oatmealproblem

.vscode/settings.json

@@ -27,7 +27,5 @@
 		"editor.defaultFormatter": "rust-lang.rust-analyzer"
 	},
 	"eslint.run": "onType",
-	"editor.codeActionsOnSave": {
-		"source.organizeImports": "explicit"
-	}
+	"editor.codeActionsOnSave": {}
 }

src/renderer/src/lib/map/data/locUtils.ts

@@ -45,7 +45,7 @@ export function localizeTextSync(
 		}
 	}
 	let value = loc[text.key];
-	if (value == null) return removeColorCodes(text.key);
+	if (value == null) return removeColorAndIconCodes(text.key);
 	if (text.variables) {
 		text.variables.forEach((variable) => {
 			const localizedVariable = localizeTextSync(variable.value, loc);
@@ -55,9 +55,9 @@ export function localizeTextSync(
 				.replace(`<${variable.key}>`, localizedVariable);
 		});
 	}
-	return removeColorCodes(value);
+	return removeColorAndIconCodes(value);
 }
 
-function removeColorCodes(text: string): string {
-	return text.replace(/[\u0011§]./g, ''); // eslint-disable-line no-control-regex
+export function removeColorAndIconCodes(text: string): string {
+	return text.replace(/[\u0011§].?/g, '').replace(/\u0013\w*/g, ''); // eslint-disable-line no-control-regex
 }

src/renderer/src/lib/map/data/processLabels.ts

@@ -3,6 +3,7 @@ import polylabel from 'polylabel';
 
 import type { GameState } from '../../GameState';
 import type { MapSettings } from '../../settings';
+import { removeColorAndIconCodes } from './locUtils';
 import type processBorders from './processBorders';
 import type processSystemOwnership from './processSystemOwnership';
 import type processTerraIncognita from './processTerraIncognita';
@@ -58,7 +59,9 @@ export default function processLabels(
 			);
 	const labels = idGeojsonPairs.map(([countryId, geojson]) => {
 		const countryName = countryNames[countryId] ?? '';
-		const playerName = gameState.player.find((player) => player.country === countryId)?.name ?? '';
+		const playerName = removeColorAndIconCodes(
+			gameState.player.find((player) => player.country === countryId)?.name ?? '',
+		);
 		let primaryName = '';
 		let secondaryName = '';
 		switch (settings.countryNamesType) {