From 34835697e889799e2b4e97c3bbf0ea73c04d5a64 Mon Sep 17 00:00:00 2001
From: Roman / Linnea Gräf <roman.graef@gmail.com>
Date: Fri, 21 Jul 2023 09:28:48 +0200
Subject: Use ursa-minor as API proxy (#762)

* Use ursa-minor as API proxy

* Allow setting a ursa server url

* Make client aware of x-ursa-expires

* Make profile data syncer work using legacy api

* Add better header support

* Add manual call functionality

* Improve callUrsa to allow for raw strings

* Save tokens better and add logs on http failure status codes

* Remove API key requirement for PV

* Make museum in pv also use ursa
---
 .../notenoughupdates/profileviewer/ProfileViewer.java          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
index a81956f2..ed3cf8ef 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
@@ -22,6 +22,7 @@ package io.github.moulberry.notenoughupdates.profileviewer;
 import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NEUManager;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.util.UrsaClient;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import lombok.Getter;
 import net.minecraft.init.Blocks;
@@ -474,7 +475,7 @@ public class ProfileViewer {
 		updatingResourceCollection.set(true);
 
 		NotEnoughUpdates.INSTANCE.manager.apiUtils
-			.newHypixelApiRequest("resources/skyblock/collections")
+			.newAnonymousHypixelApiRequest("resources/skyblock/collections")
 			.requestJson()
 			.thenAccept(jsonObject -> {
 				updatingResourceCollection.set(false);
@@ -528,11 +529,8 @@ public class ProfileViewer {
 					callback.accept(null);
 				} else {
 					if (!uuidToHypixelProfile.containsKey(uuid)) {
-						manager.apiUtils
-							.newHypixelApiRequest("player")
-							.queryArgument("uuid", uuid)
-							.maxCacheAge(Duration.ofSeconds(30))
-							.requestJson()
+						manager.ursaClient
+							.get(UrsaClient.player(Utils.parseDashlessUUID(uuid)))
 							.thenAccept(playerJson -> {
 									if (
 										playerJson != null &&
-- 
cgit