From 43e98f5d946872b7acbbb37001de1a49f81bd2ec Mon Sep 17 00:00:00 2001
From: Manuel Raimann <raimannma@outlook.de>
Date: Wed, 26 Feb 2025 18:52:37 +0100
Subject: [PATCH] Rename cluster_id -> replay_group_id

---
 deadlock_data_api/routers/v1.py       | 8 +++-----
 deadlock_data_api/routers/v1_utils.py | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/deadlock_data_api/routers/v1.py b/deadlock_data_api/routers/v1.py
index d5b4f9d..73b7c31 100644
--- a/deadlock_data_api/routers/v1.py
+++ b/deadlock_data_api/routers/v1.py
@@ -521,13 +521,11 @@ def get_match_salts(
             [RateLimit(limit=60, period=3600)] if not account_groups else [],
         )
         salts = get_match_salts_from_steam(match_id, True, account_groups)
-    metadata_url = f"http://replay{salts.cluster_id}.valve.net/1422450/{match_id}_{salts.metadata_salt}.meta.bz2"
-    demo_url = (
-        f"http://replay{salts.cluster_id}.valve.net/1422450/{match_id}_{salts.replay_salt}.dem.bz2"
-    )
+    metadata_url = f"http://replay{salts.replay_group_id}.valve.net/1422450/{match_id}_{salts.metadata_salt}.meta.bz2"
+    demo_url = f"http://replay{salts.replay_group_id}.valve.net/1422450/{match_id}_{salts.replay_salt}.dem.bz2"
     return DataUrlsResponse(
         match_id=match_id,
-        cluster_id=salts.cluster_id,
+        cluster_id=salts.replay_group_id,
         metadata_salt=salts.metadata_salt,
         replay_salt=salts.replay_salt,
         metadata_url=metadata_url,
diff --git a/deadlock_data_api/routers/v1_utils.py b/deadlock_data_api/routers/v1_utils.py
index 61d9a01..4ef1ae0 100644
--- a/deadlock_data_api/routers/v1_utils.py
+++ b/deadlock_data_api/routers/v1_utils.py
@@ -91,7 +91,7 @@ def get_match_salts_from_db(
         result = result[0]
         if not need_demo or result[1] != 0:
             return CMsgClientToGCGetMatchMetaDataResponse(
-                metadata_salt=result[0], replay_salt=result[1], cluster_id=result[2]
+                metadata_salt=result[0], replay_salt=result[1], replay_group_id=result[2]
             )
     return None
 
@@ -133,14 +133,14 @@ def get_match_salts_from_steam(
                 "match_id": match_id,
                 "metadata_salt": msg.metadata_salt,
                 "replay_salt": msg.replay_salt,
-                "cluster_id": msg.cluster_id,
+                "cluster_id": msg.replay_group_id,
             },
         )
     return msg
 
 
 def fetch_metadata(match_id: int, salts: CMsgClientToGCGetMatchMetaDataResponse) -> bytes:
-    meta_url = f"http://replay{salts.cluster_id}.valve.net/1422450/{match_id}_{salts.metadata_salt}.meta.bz2"
+    meta_url = f"http://replay{salts.replay_group_id}.valve.net/1422450/{match_id}_{salts.metadata_salt}.meta.bz2"
     metafile = requests.get(meta_url)
     metafile.raise_for_status()
     metafile = metafile.content