Asset Uploads & Webpage adjustments / Auto scheduler BXT news fix

- Made various visual and functionality improvements to the BXT Trade Corner, Battle Tower and Rankings pages.
- Added basic mobile support to the crystal pages.
- Removed exchange.php and replaced it with tradecorner.php
- Added icons and background images for various games, and removed the backgrounds for the trainer sprites.
- Changed the gbwars3 pages to use the gbwars font and gave it a background.
- Prettified the Mario Kart page and made it use the mkgba font.
- Fixed a bug related to rankings table purging when the next news issue comes into effect (it should now purge correctly)
- There is an issue with the locale dropdown on these new pages, I have not yet figured out why.

Author: gb-mobile

app/auto-schedule/index.js

@@ -1764,17 +1764,31 @@ async function mirrorVanillaToCustom(conn, region, vanillaId, existingCustomId)
   return res.insertId;
 }
 
-async function clearRankingsForNewsId(conn, region, newsId) {
-  if (newsId == null) return;
-  await conn.execute("DELETE FROM bxt_ranking WHERE game_region = ? AND news_id = ?", [
-    region,
-    newsId,
-  ]);
+async function clearRankingsForRegion(conn, region, reason) {
+  if (!region) return;
+  await conn.execute("DELETE FROM bxt_ranking WHERE game_region = ?", [region]);
   console.log(
-    `[news] Cleared bxt_ranking entries for region=${region} news_id=${newsId}`
+    `[news] Cleared bxt_ranking entries for region=${region}` +
+      (reason ? ` (${reason})` : "")
   );
 }
 
+function allRegionsUpdatedForRun(regionFolderMap, updatedByRegion) {
+  const regions = Object.keys(regionFolderMap || {});
+  if (!regions.length) return false;
+  for (const region of regions) {
+    if (!updatedByRegion || !updatedByRegion[region]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+async function clearAllRankings(conn, reason) {
+  await conn.execute("DELETE FROM bxt_ranking");
+  console.log(`[news] Cleared full bxt_ranking table (${reason})`);
+}
+
 async function processPokemonNewsCycle(
   conn,
   encoding,
@@ -2063,6 +2077,7 @@ async function finalizePokemonNewsCustomAndRankings(
   customEnabled
 ) {
   const regions = Object.keys(vanillaCfg.region_folder_map || {});
+  const customMirroredByRegion = {};
 
   for (const region of regions) {
     const vanillaRow = await getLatestBxtNewsRow(conn, region, false);
@@ -2086,6 +2101,7 @@ async function finalizePokemonNewsCustomAndRankings(
     if (!customEnabled && vanillaUpdated && vanillaUpdated[region]) {
       await mirrorVanillaToCustom(conn, region, vanillaRow.id, customRow ? customRow.id : null);
       customRow = await getLatestBxtNewsRow(conn, region, true);
+      customMirroredByRegion[region] = true;
       console.log(
         `[news] Mirrored vanilla -> custom for region=${region} (custom track disabled)`
       );
@@ -2096,22 +2112,27 @@ async function finalizePokemonNewsCustomAndRankings(
     const shareRankings = arraysEqual(vanillaSig, customSig);
 
     const vUpd = !!(vanillaUpdated && vanillaUpdated[region]);
-    const cUpd = !!(customUpdatedReal && customUpdatedReal[region]);
+    const cUpd =
+      !!(customUpdatedReal && customUpdatedReal[region]) ||
+      !!customMirroredByRegion[region];
 
     if (shareRankings) {
-      // If they share ranking categories, wipe only when BOTH tracks update together.
+      // Shared ranking categories: wipe once when both tracks roll over together.
       if (vUpd && cUpd) {
-        await clearRankingsForNewsId(conn, region, vanillaRow.id);
-        await clearRankingsForNewsId(conn, region, customRow ? customRow.id : null);
-      }
-    } else {
-      // Split rankings when category sets differ; wipe only the track(s) that updated.
-      if (vUpd) {
-        await clearRankingsForNewsId(conn, region, vanillaRow.id);
-      }
-      if (cUpd) {
-        await clearRankingsForNewsId(conn, region, customRow ? customRow.id : null);
+        await clearRankingsForRegion(
+          conn,
+          region,
+          "shared ranking categories; vanilla+custom rolled together"
+        );
       }
+    } else if (vUpd || cUpd) {
+      // Split ranking categories: wipe once when either relevant track updates.
+      const source = vUpd && cUpd ? "vanilla+custom" : (vUpd ? "vanilla" : "custom");
+      await clearRankingsForRegion(
+        conn,
+        region,
+        `split ranking categories; ${source} track updated`
+      );
     }
   }
 }
@@ -2180,6 +2201,13 @@ async function main() {
         pokemonNewsCustomEnabled
       );
 
+      if (allRegionsUpdatedForRun(newsCfg.region_folder_map, vanillaRes.updatedByRegion)) {
+        await clearAllRankings(
+          conn,
+          `all vanilla news regions updated for ${todayDate.toISOString().slice(0, 10)}`
+        );
+      }
+
       // Persist cycle state (for slot-based regions), file rotations, and timed feature windows.
       if (rotationCfg) {
         processFileRotations(rootDir, rotationCfg, cycleState, todayDate);

web/classes/SessionUtil.php

@@ -24,21 +24,32 @@ public function initSession($userId) {
 		}
 
 		public function setLocale($locale) {
-			$_SESSION["locale"] = $lang;
+			$supported = array("en", "ja", "de", "es", "it", "fr");
+			$normalized = strtolower(trim((string)$locale));
+			if (!in_array($normalized, $supported, true)) {
+				$normalized = "en";
+			}
+			$_SESSION["locale"] = $normalized;
 			// TODO: Persist to user prefs if signed in
 			return;
 		}
 
 		public function getLocale() {
+			$supported = array("en", "ja", "de", "es", "it", "fr");
 			// TODO: Initial value from user prefs if signed in
 			if(isset($_GET["lang"])) {
-				$_SESSION["locale"] = $_GET["lang"];
+				$this->setLocale($_GET["lang"]);
 			}
 			elseif (!isset($_SESSION["locale"])) {
 				if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && strlen($_SERVER['HTTP_ACCEPT_LANGUAGE'])>0) {
-					$_SESSION["locale"] = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+					$this->setLocale(substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2));
+				} else {
+					$_SESSION["locale"] = "en";
 				}
 			}
+			elseif (!in_array(strtolower((string)$_SESSION["locale"]), $supported, true)) {
+				$_SESSION["locale"] = "en";
+			}
 			return $_SESSION["locale"];
 		}
 

web/classes/TemplateUtil.php

@@ -6,7 +6,7 @@ class TemplateUtil {
 
 		private static $instance;
 		private $twig;
-		private $translator;
+		private static $translator = null;
 
 		private final function  __construct() {
 			$loader = new \Twig\Loader\FilesystemLoader(dirname(__DIR__)."/templates");
@@ -32,15 +32,50 @@ public static function translate(?string $id, array $parameters = [], ?string $d
 		}
 
 		public static function getTranslator() {
+			if (self::$translator !== null) {
+				return self::$translator;
+			}
+
 			$locale = SessionUtil::getInstance()->getLocale();
 			$translator = new \Symfony\Component\Translation\Translator($locale);
 			$translator->setFallbackLocales(['en']);
+
+			if (!class_exists('\Symfony\Component\Translation\Loader\YamlFileLoader')) {
+				error_log("Translation YAML loader class unavailable; locale resources cannot be loaded.");
+				self::$translator = $translator;
+				return self::$translator;
+			}
+
 			$translator->addLoader('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
-			$supported_locales =  ['en', 'es', 'de', 'ja', 'it', 'fr'];
-			foreach($supported_locales as $l) {
-				$translator->addResource('yaml',  dirname(__DIR__).'/locales/'.$l.'.yml', $l);
+
+			$supported_locales = ['en', 'es', 'de', 'ja', 'it', 'fr'];
+			foreach ($supported_locales as $l) {
+				$path = dirname(__DIR__) . '/locales/' . $l . '.yml';
+				if (!is_file($path)) {
+					continue;
+				}
+
+				try {
+					if (class_exists('\Symfony\Component\Yaml\Yaml')) {
+						$raw = @file_get_contents($path);
+						if (!is_string($raw) || $raw === '') {
+							throw new \RuntimeException("Locale file is empty or unreadable");
+						}
+
+						$sanitized = preg_replace('/^\xEF\xBB\xBF/', '', $raw);
+						$sanitized = preg_replace('/^\s*---\s*(\r?\n)/m', '', $sanitized);
+						$sanitized = preg_replace('/^\s*\.\.\.\s*(\r?\n)/m', '', $sanitized);
+						\Symfony\Component\Yaml\Yaml::parse($sanitized);
+					}
+
+					$translator->addResource('yaml', $path, $l);
+				} catch (\Throwable $e) {
+					error_log("Skipping invalid locale YAML [{$l}] at {$path}: " . $e->getMessage());
+				}
 			}
-			return $translator;
+
+			self::$translator = $translator;
+			return self::$translator;
 		}
 
 	}