From aae45fca275cb820123bc7225ad52e2e43de3dd0 Mon Sep 17 00:00:00 2001
From: drmext <71258889+drmext@users.noreply.github.com>
Date: Wed, 21 Sep 2022 05:34:01 +0000
Subject: [PATCH] Fixes #1

---
 modules/ddr/playerdata.py   | 33 ++++++++++++++++++---------------
 modules/ddr/playerdata_2.py | 33 ++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/modules/ddr/playerdata.py b/modules/ddr/playerdata.py
index 002db31..13932ed 100644
--- a/modules/ddr/playerdata.py
+++ b/modules/ddr/playerdata.py
@@ -72,21 +72,24 @@ async def usergamedata_advanced(request: Request):
 
     if mode == 'userload':
         all_scores = {}
-        for record in db.table('ddr_scores_best').search(where('game_version') == game_version):
-            mcode = str(record['mcode'])
-            if mcode not in all_scores.keys():
-                scores = []
-                for difficulty in range(10):
-                    s = db.table('ddr_scores_best').get(
-                        (where('mcode') == int(mcode))
-                        & (where('difficulty') == difficulty)
-                    )
-                    if s == None:
-                        scores.append([0, 0, 0, 0, 0])
-                    else:
-                        scores.append([1, s['rank'], s['lamp'], s['score'], s['ghostid']])
-
-                all_scores[mcode] = scores
+        if all_profiles_for_card is not None:
+            ddr_id = all_profiles_for_card['ddr_id']
+            for record in db.table('ddr_scores_best').search(where('game_version') == game_version):
+                mcode = str(record['mcode'])
+                if mcode not in all_scores.keys():
+                    scores = []
+                    for difficulty in range(10):
+                        s = db.table('ddr_scores_best').get(
+                            (where('ddr_id') == ddr_id)
+                            & (where('game_version') == game_version)
+                            & (where('mcode') == int(mcode))
+                            & (where('difficulty') == difficulty)
+                        )
+                        if s == None:
+                            scores.append([0, 0, 0, 0, 0])
+                        else:
+                            scores.append([1, s['rank'], s['lamp'], s['score'], s['ghostid']])
+                    all_scores[mcode] = scores
 
         response = E.response(
             E.playerdata(
diff --git a/modules/ddr/playerdata_2.py b/modules/ddr/playerdata_2.py
index 509f6b5..8b74ff8 100644
--- a/modules/ddr/playerdata_2.py
+++ b/modules/ddr/playerdata_2.py
@@ -72,21 +72,24 @@ async def usergamedata_advanced(request: Request):
 
     if mode == 'userload':
         all_scores = {}
-        for record in db.table('ddr_scores_best').search(where('game_version') == game_version):
-            mcode = str(record['mcode'])
-            if mcode not in all_scores.keys():
-                scores = []
-                for difficulty in range(10):
-                    s = db.table('ddr_scores_best').get(
-                        (where('mcode') == int(mcode))
-                        & (where('difficulty') == difficulty)
-                    )
-                    if s == None:
-                        scores.append([0, 0, 0, 0, 0])
-                    else:
-                        scores.append([1, s['rank'], s['lamp'], s['score'], s['ghostid']])
-
-                all_scores[mcode] = scores
+        if all_profiles_for_card is not None:
+            ddr_id = all_profiles_for_card['ddr_id']
+            for record in db.table('ddr_scores_best').search(where('game_version') == game_version):
+                mcode = str(record['mcode'])
+                if mcode not in all_scores.keys():
+                    scores = []
+                    for difficulty in range(10):
+                        s = db.table('ddr_scores_best').get(
+                            (where('ddr_id') == ddr_id)
+                            & (where('game_version') == game_version)
+                            & (where('mcode') == int(mcode))
+                            & (where('difficulty') == difficulty)
+                        )
+                        if s == None:
+                            scores.append([0, 0, 0, 0, 0])
+                        else:
+                            scores.append([1, s['rank'], s['lamp'], s['score'], s['ghostid']])
+                    all_scores[mcode] = scores
 
         response = E.response(
             E.playerdata_2(