From d825487cc49c267fa52aaa714a6f099b2d549169 Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Thu, 14 Aug 2025 11:21:01 -0700
Subject: [PATCH] restrict problematic flags fixes #1690 (#1805)

## Description:

Some flags are offensive, so don't allow them to be selected by users.

I think it's fine for nations continue to use the flags.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced

## Please put your Discord username so you can be contacted if a bug or
regression is found:

evan
---
 src/client/FlagInputModal.ts   | 11 ++++++++---
 src/client/data/countries.json |  9 ++++++---
 src/core/Schemas.ts            |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/client/FlagInputModal.ts b/src/client/FlagInputModal.ts
index 86e413677..996da1028 100644
--- a/src/client/FlagInputModal.ts
+++ b/src/client/FlagInputModal.ts
@@ -29,9 +29,7 @@ export class FlagInputModal extends LitElement {
           class="flex flex-wrap justify-evenly gap-[1rem] overflow-y-auto overflow-x-hidden h-[90%]"
         >
           ${Countries.filter(
-            (country) =>
-              country.name.toLowerCase().includes(this.search.toLowerCase()) ||
-              country.code.toLowerCase().includes(this.search.toLowerCase()),
+            (country) => !country.restricted && this.includedInSearch(country),
           ).map(
             (country) => html`
               <button
@@ -64,6 +62,13 @@ export class FlagInputModal extends LitElement {
     `;
   }
 
+  private includedInSearch(country: { name: string; code: string }): boolean {
+    return (
+      country.name.toLowerCase().includes(this.search.toLowerCase()) ||
+      country.code.toLowerCase().includes(this.search.toLowerCase())
+    );
+  }
+
   private handleSearch(event: Event) {
     this.search = (event.target as HTMLInputElement).value;
   }
diff --git a/src/client/data/countries.json b/src/client/data/countries.json
index 24e438711..e46b5ae8a 100644
--- a/src/client/data/countries.json
+++ b/src/client/data/countries.json
@@ -484,7 +484,8 @@
   {
     "code": "Confederate States",
     "continent": "North America",
-    "name": "Confederate States"
+    "name": "Confederate States",
+    "restricted": true
   },
   {
     "code": "1_Connacht",
@@ -702,7 +703,8 @@
   {
     "code": "Fascist Spain",
     "continent": "Europe",
-    "name": "Fascist Spain"
+    "name": "Fascist Spain",
+    "restricted": true
   },
   {
     "code": "fm",
@@ -805,7 +807,8 @@
   {
     "code": "German Empire",
     "continent": "Europe",
-    "name": "German Empire"
+    "name": "German Empire",
+    "restricted": true
   },
   {
     "code": "de",
diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts
index 5889cccb8..ee06566ed 100644
--- a/src/core/Schemas.ts
+++ b/src/core/Schemas.ts
@@ -189,7 +189,7 @@ export const ID = z
 export const AllPlayersStatsSchema = z.record(ID, PlayerStatsSchema);
 
 export const UsernameSchema = SafeString;
-const countryCodes = countries.map((c) => c.code);
+const countryCodes = countries.filter((c) => !c.restricted).map((c) => c.code);
 export const FlagSchema = z
   .string()
   .max(128)