From eb9c30d7b2f8336488c40613903c130fec7c72ca Mon Sep 17 00:00:00 2001 From: JensC Date: Wed, 22 Mar 2023 17:48:53 +0100 Subject: [PATCH 1/3] Change buildnumber webreq --- .../discordbot/listeners/DumpHandler.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java b/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java index 9bcefba1..7bd32f22 100644 --- a/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java +++ b/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java @@ -51,8 +51,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.time.Instant; import java.util.ArrayList; import java.util.List; @@ -213,7 +211,7 @@ private void parseDump(@NotNull MessageReceivedEvent event, String cleanURL, Str // Set the latest info based on the returned comparison if (compare.getBehindBy() != 0 || compare.getAheadBy() != 0) { gitData.append("**Latest:** No\n"); - problems.add("- You aren't on the latest Geyser version! Please [download](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) the latest version."); + problems.add("- You aren't on the latest Geyser version! Please [download](https://geysermc.org/download) the latest version."); } else { gitData.append("**Latest:** Yes\n"); } @@ -237,20 +235,19 @@ private void parseDump(@NotNull MessageReceivedEvent event, String cleanURL, Str if (!isFork && gitInfo.has("git.build.number")) { try { // Attempt to see how far behind they are not based on commits but CI builds - String buildXML = RestClient.simpleGetString("https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/" + - URLEncoder.encode(gitInfo.getString("git.branch"), StandardCharsets.UTF_8.toString()) + "/lastSuccessfulBuild/api/xml?xpath=//buildNumber"); - if (buildXML.startsWith("")) { - int latestBuildNum = Integer.parseInt(buildXML.replaceAll("<(\\\\)?(/)?buildNumber>", "").trim()); + JSONObject response = new JSONObject("https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest"); + if (response.get("build") != null) { + int latestBuildNum = Integer.parseInt(String.valueOf(response.get("build"))); int buildNum = Integer.parseInt(gitInfo.getString("git.build.number")); int buildNumDiff = latestBuildNum - buildNum; if (buildNumDiff > 0) { compareByBuildNumber = true; String compareUrl = gitUrl + "/compare/" + gitInfo.getString("git.commit.id.abbrev") + "..." + gitInfo.getString("git.branch"); - gitData.append("Behind by [").append(buildNumDiff).append(" CI build").append(buildNumDiff == 1 ? "" : "s").append("](").append(compareUrl).append(")\n"); + gitData.append("Behind by [").append(buildNumDiff).append(" Run build").append(buildNumDiff == 1 ? "" : "s").append("](").append(compareUrl).append(")\n"); } } - } catch (IOException | NumberFormatException ignored) { + } catch (NumberFormatException ignored) { } } From 723a58aec116ff1c331a63d44712c740f6feef34 Mon Sep 17 00:00:00 2001 From: JensC Date: Wed, 22 Mar 2023 18:16:55 +0100 Subject: [PATCH 2/3] Actually do the webreq. --- .../java/org/geysermc/discordbot/listeners/DumpHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java b/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java index 7bd32f22..d599aaf6 100644 --- a/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java +++ b/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java @@ -235,7 +235,8 @@ private void parseDump(@NotNull MessageReceivedEvent event, String cleanURL, Str if (!isFork && gitInfo.has("git.build.number")) { try { // Attempt to see how far behind they are not based on commits but CI builds - JSONObject response = new JSONObject("https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest"); + RestClient.RestResponse restResponse = RestClient.getJsonObject("https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest"); + JSONObject response = restResponse.body(); if (response.get("build") != null) { int latestBuildNum = Integer.parseInt(String.valueOf(response.get("build"))); int buildNum = Integer.parseInt(gitInfo.getString("git.build.number")); From 6b757610621f0c56af1c775f4bd7cb67123bd680 Mon Sep 17 00:00:00 2001 From: JensC Date: Wed, 22 Mar 2023 18:26:25 +0100 Subject: [PATCH 3/3] don't need a null check since it will return a value of -1 of it failed. --- .../discordbot/listeners/DumpHandler.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java b/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java index d599aaf6..471226e7 100644 --- a/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java +++ b/src/main/java/org/geysermc/discordbot/listeners/DumpHandler.java @@ -237,16 +237,15 @@ private void parseDump(@NotNull MessageReceivedEvent event, String cleanURL, Str // Attempt to see how far behind they are not based on commits but CI builds RestClient.RestResponse restResponse = RestClient.getJsonObject("https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest"); JSONObject response = restResponse.body(); - if (response.get("build") != null) { - int latestBuildNum = Integer.parseInt(String.valueOf(response.get("build"))); - int buildNum = Integer.parseInt(gitInfo.getString("git.build.number")); - - int buildNumDiff = latestBuildNum - buildNum; - if (buildNumDiff > 0) { - compareByBuildNumber = true; - String compareUrl = gitUrl + "/compare/" + gitInfo.getString("git.commit.id.abbrev") + "..." + gitInfo.getString("git.branch"); - gitData.append("Behind by [").append(buildNumDiff).append(" Run build").append(buildNumDiff == 1 ? "" : "s").append("](").append(compareUrl).append(")\n"); - } + + int latestBuildNum = response.getInt("build"); + int buildNum = Integer.parseInt(gitInfo.getString("git.build.number")); + int buildNumDiff = latestBuildNum - buildNum; + if (buildNumDiff > 0) { + compareByBuildNumber = true; + String compareUrl = gitUrl + "/compare/" + gitInfo.getString("git.commit.id.abbrev") + "..." + gitInfo.getString("git.branch"); + gitData.append("Behind by [").append(buildNumDiff).append(" Run build").append(buildNumDiff == 1 ? "" : "s").append("](").append(compareUrl).append(")\n"); + } } catch (NumberFormatException ignored) { }