From 812a67a47a04151b0da2c7f8eeb0075e919db4a1 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Thu, 22 Jan 2026 20:43:58 -0700 Subject: [PATCH] Fix icon marketplace view endpoint --- .../Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs | 7 ++++--- Assets/Scripts/Other/Endpoints.cs | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs index cf7b0fb..f43248f 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs @@ -135,7 +135,6 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour } ShowStatus("Loading..."); WWWForm dataForm = new(); - dataForm.AddField("userId", (BazookaManager.Instance.GetAccountID() ?? 0).ToString()); dataForm.AddField("sortBy", optionsPanelSortByDropdown.value.ToString()); dataForm.AddField("priceRangeEnabled", optionsPanelPriceRangeToggle.isOn.ToString()); dataForm.AddField("priceRangeMin", priceRangeMin); @@ -145,7 +144,8 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour dataForm.AddField("onlyShowEnabled", optionsPanelOnlyShowToggle.isOn.ToString()); dataForm.AddField("onlyShowValue", optionsPanelOnlyShowDropdown.value.ToString()); dataForm.AddField("currentIcons", Convert.ToBase64String(Encoding.UTF8.GetBytes(currentIcons.ToString(Formatting.None)))); - using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "berrydash/getMarketplaceIcons.php", dataForm); + using UnityWebRequest request = UnityWebRequest.Post(Endpoints.ICON_MARKETPLACE_ENDPOINT, dataForm); + request.SetRequestHeader("Authorization", BazookaManager.Instance.GetAccountSession() ?? ""); request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); @@ -178,7 +178,8 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour else { ShowStatus(null); - var icons = JsonConvert.DeserializeObject(response); + var jsonResponse = JObject.Parse(response); + var icons = JsonConvert.DeserializeObject(jsonResponse["data"].ToString()); var localUserID = BazookaManager.Instance.GetAccountID(); foreach (var entry in icons) { diff --git a/Assets/Scripts/Other/Endpoints.cs b/Assets/Scripts/Other/Endpoints.cs index 767aa85..5fc7107 100644 --- a/Assets/Scripts/Other/Endpoints.cs +++ b/Assets/Scripts/Other/Endpoints.cs @@ -14,6 +14,7 @@ public class Endpoints public static readonly string LEADERBOARDS_TOTAL_ENDPOINT = LEADERBOARDS_ENDPOINT + "/total"; public static readonly string PROFILE_ENDPOINT = BERRYDASH_ENDPOINT + "/profile"; public static readonly string PROFILE_POSTS_ENDPOINT = PROFILE_ENDPOINT + "/posts"; + public static readonly string ICON_MARKETPLACE_ENDPOINT = BERRYDASH_ENDPOINT + "/icon-marketplace"; public static readonly string ACCOUNT_ENDPOINT = BERRYDASH_ENDPOINT + "/account"; public static readonly string ACCOUNT_LOGIN_ENDPOINT = ACCOUNT_ENDPOINT + "/login"; public static readonly string ACCOUNT_REGISTER_ENDPOINT = ACCOUNT_ENDPOINT + "/register";