add a flag to spoiler unit names (#45)

scmscx · Feb 11, 2025 · bfc8030 · bfc8030
1 parent 73cf712
commit bfc8030
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/app/modules/language.tsx b/app/modules/language.tsx
@@ -114,6 +114,7 @@ const langmap = {
     Outdated: "Устаревшая",
     Broken: "Сломанная",
     "Black Holed": "Чёрная дыра",
+    "Spoiler Unit Names": "Названия споилированных единиц",
 
     Key: "Ключ",
     Value: "Значение",
@@ -315,6 +316,7 @@ const langmap = {
     Outdated: "Desactualizado",
     Broken: "Roto",
     "Black Holed": "Arrojado a un agujero negro",
+    "Spoiler Unit Names": "Nombres de unidades de spoiler",
 
     Key: "Clave",
     Value: "Valor",
@@ -549,6 +551,7 @@ const langmap = {
     Outdated: "시대에 뒤쳐진",
     Broken: "고장난",
     "Black Holed": "블랙홀",
+    "Spoiler Unit Names": "스플로러 유닛 이름",
 
     "MPQ Hash": "MPQ 해시",
     "MPQ Size": "MPQ 크기",
@@ -793,6 +796,7 @@ const langmap = {
     Outdated: "過時",
     Broken: "破壞",
     "Black Holed": "已被黑洞吞噬",
+    "Spoiler Unit Names": "懷疑單位名稱",
 
     Tags: "標籤",
     Key: "鍵",

diff --git a/app/pages/Map.tsx b/app/pages/Map.tsx
@@ -608,6 +608,9 @@ const Flags = (props: any) => {
   const [outdated] = useApi(() => `/api/flags/${props.mapId}/outdated`);
   const [broken] = useApi(() => `/api/flags/${props.mapId}/broken`);
   const [blackholed] = useApi(() => `/api/flags/${props.mapId}/blackholed`);
+  const [spoiler_unit_names] = useApi(
+    () => `/api/flags/${props.mapId}/spoiler_unit_names`
+  );
 
   const mutate = (mapId: string, key: string, value: boolean) => {
     fetch(`/api/flags/${mapId}/${key}`, {
@@ -689,6 +692,19 @@ const Flags = (props: any) => {
             <I18nSpan text="Black Holed" />
           </label>
         </div>
+        <div class={style.flag}>
+          <label for="checkbox_spoiler_unit_names">
+            <input
+              type="checkbox"
+              id="checkbox_spoiler_unit_names"
+              checked={spoiler_unit_names()}
+              onChange={(evt) => {
+                mutate(props.mapId, "spoiler_unit_names", evt.target.checked);
+              }}
+            />
+            <I18nSpan text="Spoiler Unit Names" />
+          </label>
+        </div>
       </div>
     </Suspense>
   );

diff --git a/crates/bwmapserver/src/api/flags.rs b/crates/bwmapserver/src/api/flags.rs
@@ -30,6 +30,7 @@ async fn get_flag(
         "outdated" => "select outdated from map where map.id = $1",
         "broken" => "select broken from map where map.id = $1",
         "blackholed" => "select blackholed from map where map.id = $1",
+        "spoiler_unit_names" => "select spoiler_unit_names from map where map.id = $1",
         _ => return Ok(HttpResponse::NotFound().finish()),
     };
 
@@ -85,6 +86,9 @@ async fn set_flag(
         "blackholed" => {
             "update map set blackholed = $1 where map.id = $2 and (map.uploaded_by = $3 or $3 = 4)"
         }
+        "spoiler_unit_names" => {
+            "update map set spoiler_unit_names = $1 where map.id = $2 and (map.uploaded_by = $3 or $3 = 4)"
+        }
         _ => return Ok(HttpResponse::NotFound().finish()),
     };
 

diff --git a/crates/bwmapserver/src/api/uiv2/units.rs b/crates/bwmapserver/src/api/uiv2/units.rs
@@ -25,11 +25,11 @@ async fn units(
         bwcommon::get_db_id_from_web_id(&map_id, crate::util::SEED_MAP_ID)?
     };
 
-    let chkblob = {
+    let (chkblob, spoiler_unit_names) = {
         let con = pool.get().await?;
         let row = con
             .query_one(
-                "select length, ver, data
+                "select length, ver, data, spoiler_unit_names
                 from map
                 join chkblob on chkblob.hash = map.chkblob
                 where map.id = $1
@@ -43,7 +43,10 @@ async fn units(
         let data = row.try_get::<_, Vec<u8>>("data")?;
 
         bwcommon::ensure!(ver == 1);
-        zstd::bulk::decompress(data.as_slice(), length)?
+        (
+            zstd::bulk::decompress(data.as_slice(), length)?,
+            row.try_get::<_, bool>("spoiler_unit_names")?,
+        )
     };
 
     let info = ApiSpecificInfoForLogging {
@@ -59,8 +62,10 @@ async fn units(
             if x.config[unit_id] == 0 && x.string_number[unit_id] != 0 {
                 v.push(json!({
                     "unit_id": unit_id,
-                    "name": parsed_chk.get_string(x.string_number[unit_id] as usize)
-                        .unwrap_or("couldn't decode string".to_owned()),
+                    "name": if spoiler_unit_names { "SPOILER".to_owned()  } else {
+                        parsed_chk.get_string(x.string_number[unit_id] as usize)
+                        .unwrap_or("couldn't decode string".to_owned())
+                        },
                 }));
             }
         }

diff --git a/postgres/00-init.sh b/postgres/00-init.sh
@@ -429,7 +429,8 @@ psql -v ON_ERROR_STOP=1 --username "postgres" -d "bounding.net" <<-'EOSQL'
         unfinished boolean DEFAULT false NOT NULL,
         denorm_scenario text,
         mapblob_size bigint NOT NULL,
-        blackholed boolean DEFAULT false NOT NULL
+        blackholed boolean DEFAULT false NOT NULL,
+        spoiler_unit_names bool DEFAULT false NOT NULL
     );