Merge pull request #20 from arekbauer/vct-updates

Add TEAM_MAP for team abbreviations and update match result formatting

Author: arekbauer

trmnl_service/services.py

@@ -1,6 +1,7 @@
 import requests
 from datetime import datetime, timedelta
 from zoneinfo import ZoneInfo
+from .teams import TEAM_MAP
 
 class VLRService:
     MATCHES_URL = "https://vlr.orlandomm.net/api/v1/matches"
@@ -26,7 +27,7 @@ def get_vct_dashboard_data(cls):
         return {
             **results, # Contains y_res and t_res
             **matches, # Contains live, t_up, and tom_up
-            "last_updated": now.strftime("%H:%M")
+            "last_updated": now.strftime("%H:%M").lower()
         }
 
     # --- Private Logic: Processing ---
@@ -99,15 +100,24 @@ def _normalize_item(data):
         time_str = ""
 
         if ts:
+            # Apply 6-hour correction and convert to London Time
             corrected_ts = ts + (VLRService.TIME_OFFSET_HOURS * 3600)
-            dt_utc = datetime.fromtimestamp(corrected_ts, tz=ZoneInfo("UTC"))
-            dt_london = dt_utc.astimezone(VLRService.LONDON_TZ)
-            time_str = dt_london.strftime("%H:%M")
+            dt_london = datetime.fromtimestamp(corrected_ts, tz=ZoneInfo("UTC")).astimezone(VLRService.LONDON_TZ)
+            
+            # FORMAT: 12-hour time
+            time_str = dt_london.strftime("%I:%M%p").lower().lstrip('0')
+            
+        t1_full = data['teams'][0]['name']
+        t2_full = data['teams'][1]['name']
+
+        # Check if abbreviation exists, otherwise use full name
+        t1_display = TEAM_MAP.get(t1_full, t1_full)
+        t2_display = TEAM_MAP.get(t2_full, t2_full)
 
         return {
-            "t1": data['teams'][0]['name'],
+            "t1": t1_display,
             "s1": data['teams'][0].get('score'),
-            "t2": data['teams'][1]['name'],
+            "t2": t2_display,
             "s2": data['teams'][1].get('score'),
             "tournament": data.get('tournament'),
             "event": data.get('event'),

trmnl_service/teams.py

@@ -0,0 +1,57 @@
+TEAM_MAP = {
+    # --- EMEA ---
+    "Natus Vincere": "NAVI",
+    "Karmine Corp": "KC",
+    "Fnatic": "FNC",
+    "Gentle Mates": "M8",
+    "Team Vitality": "VIT",
+    "FUT Esports": "FUT",
+    "BBL Esports": "BBL",
+    "PCIFIC Esports": "PCF",
+    "Team Heretics": "TH",
+    "Team Liquid": "TL",
+    "GIANTX": "GX",
+    "ULF Esports": "ULF",
+
+    # --- AMERICAS ---
+    "Evil Geniuses": "EG",
+    "G2 Esports": "G2",
+    "100 Thieves": "100T",
+    "Cloud9": "C9",
+    "FURIA": "FUR",
+    "KRÜ Esports": "KRÜ",
+    "Leviatán": "LEV",
+    "LOUD": "LOUD",
+    "MIBR": "MIBR",
+    "NRG": "NRG",
+    "Sentinels": "SEN",
+    "ENVY": "ENVY",
+
+    # --- PACIFIC ---
+    "DetonatioN FocusMe": "DFM",
+    "DRX": "DRX",
+    "Gen.G": "GEN",
+    "Global Esports": "GE",
+    "Paper Rex": "PRX",
+    "Rex Regum Qeon": "RRQ",
+    "T1": "T1",
+    "Team Secret": "TS",
+    "ZETA DIVISION": "ZETA",
+    "FULL SENSE": "FS",
+    "Nongshim RedForce": "NS",
+    "VARREL": "VL",
+
+    # --- CHINA ---
+    "All Gamers": "AG",
+    "Bilibili Gaming": "BLG",
+    "EDward Gaming": "EDG",
+    "FunPlus Phoenix": "FPX",
+    "JD Gaming": "JDG",
+    "Nova Esports": "NOVA",
+    "Titan Esports Club": "TEC",
+    "Trace Esports": "TE",
+    "TYLOO": "TYL",
+    "Wolves Esports": "WOL",
+    "Dragon Ranger Gaming": "DRG",
+    "XLG Esports": "XLG"
+}