firstdarkdev/sdlink-core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CHANGE] Replace Mojang API call with OkHttp with timeouts

Browse Source
This commit is contained in:
HypherionSA
2023-11-22 20:48:15 +02:00
parent 23fec44dc8
commit 6e5ef90403
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java
View File

@@ -17,6 +17,10 @@ import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.UserSnowflake; import net.dv8tion.jda.api.entities.UserSnowflake;
import okhttp3.CacheControl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -30,6 +34,7 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.sql.Time;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -374,21 +379,34 @@ public class MinecraftAccount {
//<editor-fold desc="Helper Methods"> //<editor-fold desc="Helper Methods">
private static Pair<String, UUID> fetchPlayer(String name) { private static Pair<String, UUID> fetchPlayer(String name) {
OkHttpClient client = new OkHttpClient.Builder()
.callTimeout(20, TimeUnit.SECONDS)
.readTimeout(20, TimeUnit.SECONDS)
.connectTimeout(20, TimeUnit.SECONDS)
.build();
try { try {
BufferedReader read = new BufferedReader(new InputStreamReader(new URL("https://api.mojang.com/users/profiles/minecraft/" + name).openStream())); Request request = new Request.Builder()
JSONObject obj = new JSONObject(new JSONTokener(read)); .url("https://api.mojang.com/users/profiles/minecraft/" + name)
String uuid = ""; .cacheControl(new CacheControl.Builder().noCache().build())
String returnname = name; .build();
Response response = client.newCall(request).execute();
if (!obj.getString("name").isEmpty()) { if (response.isSuccessful() && response.body() != null) {
returnname = obj.getString("name"); JSONObject obj = new JSONObject(new JSONTokener(response.body().toString()));
} String uuid = "";
if (!obj.getString("id").isEmpty()) { String returnname = name;
uuid = obj.getString("id");
}
read.close(); if (obj.has("name") && !obj.getString("name").isEmpty()) {
return Pair.of(returnname, uuid.isEmpty() ? null : mojangIdToUUID(uuid)); returnname = obj.getString("name");
}
if (obj.has("id") && !obj.getString("id").isEmpty()) {
uuid = obj.getString("id");
}
response.close();
return Pair.of(returnname, uuid.isEmpty() ? null : mojangIdToUUID(uuid));
}
} catch (IOException | JSONException e) { } catch (IOException | JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }