From 88fc5f9ed684e287d7411a59fb4fdf170acfed5a Mon Sep 17 00:00:00 2001
From: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
Date: Fri, 5 Sep 2025 19:51:56 -0300
Subject: [PATCH] refactor: use null-safe list functions in Medals and
 Leaderboards

---
 source/funkin/api/newgrounds/Leaderboards.hx | 10 ++--------
 source/funkin/api/newgrounds/Medals.hx       | 12 ++----------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/source/funkin/api/newgrounds/Leaderboards.hx b/source/funkin/api/newgrounds/Leaderboards.hx
index 12dfbc138..4b08bf784 100644
--- a/source/funkin/api/newgrounds/Leaderboards.hx
+++ b/source/funkin/api/newgrounds/Leaderboards.hx
@@ -37,10 +37,7 @@ class Leaderboards
 
     if (NewgroundsClient.instance.isLoggedIn())
     {
-      var leaderboardList = NewgroundsClient.instance.leaderboards;
-      if (leaderboardList == null) return;
-
-      var leaderboardData:Null<LeaderboardData> = leaderboardList.get(leaderboard.getId());
+      var leaderboardData:Null<LeaderboardData> = listLeaderboardData().get(leaderboard.getId());
       if (leaderboardData != null)
       {
         leaderboardData.postScore(score, function(outcome:Outcome<CallError>):Void {
@@ -67,10 +64,7 @@ class Leaderboards
     // Silently reject retrieving scores from unknown leaderboards.
     if (leaderboard == Leaderboard.Unknown) return;
 
-    var leaderboardList = NewgroundsClient.instance.leaderboards;
-    if (leaderboardList == null) return;
-
-    var leaderboardData:Null<LeaderboardData> = leaderboardList.get(leaderboard.getId());
+    var leaderboardData:Null<LeaderboardData> = listLeaderboardData().get(leaderboard.getId());
     if (leaderboardData == null) return;
 
     var user:Null<User> = null;
diff --git a/source/funkin/api/newgrounds/Medals.hx b/source/funkin/api/newgrounds/Medals.hx
index f2728f9f1..e48260bf3 100644
--- a/source/funkin/api/newgrounds/Medals.hx
+++ b/source/funkin/api/newgrounds/Medals.hx
@@ -30,11 +30,7 @@ class Medals
   {
     if (NewgroundsClient.instance.isLoggedIn())
     {
-      var medalList = NewgroundsClient.instance.medals;
-      @:privateAccess
-      if (medalList == null || medalList._map == null) return;
-
-      var medalData:Null<MedalData> = medalList.get(medal.getId());
+      var medalData:Null<MedalData> = listMedalData().get(medal.getId());
       @:privateAccess
       if (medalData == null || medalData._data == null)
       {
@@ -120,11 +116,7 @@ class Medals
 
   public static function fetchMedalData(medal:Medal):Null<FetchedMedalData>
   {
-    var medalList = NewgroundsClient.instance.medals;
-    @:privateAccess
-    if (medalList == null || medalList._map == null) return null;
-
-    var medalData:Null<MedalData> = medalList.get(medal.getId());
+    var medalData:Null<MedalData> = listMedalData().get(medal.getId());
     @:privateAccess
     if (medalData == null || medalData._data == null)
     {