Skip to content

Commit 0e5a921

Browse files
committed
Hopefully fix the timeouts checking for updates
Signed-off-by: KiriCattus <19393068+KiriCattus@users.noreply.github.com>
1 parent 821ef7b commit 0e5a921

3 files changed

Lines changed: 12 additions & 16 deletions

File tree

src/commander/java/com/mcmoddev/mmdbot/commander/updatenotifiers/SharedVersionHelpers.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@
3737
import java.net.http.HttpRequest;
3838
import java.net.http.HttpResponse;
3939
import java.nio.charset.StandardCharsets;
40+
import java.time.Duration;
4041

41-
/**
42-
* Helper methods for the Fabric and Quilt mod loader.
43-
*
44-
* @author KiriCattus
45-
*/
4642
public class SharedVersionHelpers {
4743

4844

@@ -58,7 +54,10 @@ public static InputStreamReader getReader(final String urlString) {
5854
@Nullable
5955
public static InputStream getStream(final String urlString) {
6056
try {
61-
HttpClient client = HttpClient.newHttpClient();
57+
HttpClient client = HttpClient.newBuilder()
58+
.connectTimeout(Duration.ofSeconds(5L))
59+
.followRedirects(HttpClient.Redirect.NORMAL)
60+
.build();
6261
HttpRequest request = HttpRequest.newBuilder()
6362
.uri(URI.create(urlString))
6463
.build();

src/commander/java/com/mcmoddev/mmdbot/commander/updatenotifiers/forge/ForgeUpdateNotifier.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,15 @@ protected EmbedBuilder getEmbed(@Nullable final MinecraftForgeVersions oldVersio
8282
embed.setTitle("Forge version update");
8383
embed.setColor(0x0000FF);
8484

85-
final String oldForgeVersionFull = oldVersion == null ? null : oldVersion.byMcVersion().get(mcVersion);
86-
if (oldForgeVersionFull == null) {
85+
final String oldForgeVersion = oldVersion == null ? null : oldVersion.byMcVersion().get(mcVersion);
86+
if (oldForgeVersion == null) {
8787
embed.addField("Version", version, true);
8888
} else {
89-
boolean isNoLongerBeta = isNoLongerBeta(oldForgeVersionFull, version);
90-
91-
embed.addField(isNoLongerBeta ? "New stable release" : "Latest", "**%s** -> **%s**".formatted(oldForgeVersionFull, version), true);
89+
boolean isNoLongerBeta = isNoLongerBeta(oldForgeVersion, version);
90+
embed.addField(isNoLongerBeta ? "New stable release" : "Latest", "**%s** -> **%s**".formatted(oldForgeVersion, version), true);
9291
}
9392

94-
addChangelog(embed, oldForgeVersionFull, version);
93+
addChangelog(embed, oldForgeVersion, version);
9594

9695
return embed;
9796
}

src/commander/java/com/mcmoddev/mmdbot/commander/updatenotifiers/neoforge/NeoForgeUpdateNotifier.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,12 @@ protected EmbedBuilder getEmbed(@Nullable final NeoForgeVersions oldVersion, fin
7373
.getValue();
7474
}
7575

76-
final String[] split = version.split("\\.");
77-
78-
final String mcVersion = "1." + split[0] + "." + split[1];
76+
final String mcVersion = version.split("-")[0];
7977

8078
final var embed = new EmbedBuilder();
8179
embed.addField("Minecraft Version", mcVersion, true);
8280
embed.setTitle("NeoForge version update");
83-
embed.setColor(Color.YELLOW);
81+
embed.setColor(0xFFFF00);
8482

8583
final String oldNeoVersion = oldVersion == null ? null : oldVersion.byMcVersion().get(mcVersion);
8684
if (oldNeoVersion == null) {

0 commit comments

Comments
 (0)