From b5eb49b24548320e27c6a4ff99fba36b3fa633f0 Mon Sep 17 00:00:00 2001 From: ZayrexDev Date: Wed, 27 May 2026 01:08:16 +0800 Subject: [PATCH] Update README and Router to correct endpoint paths and improve clarity --- src/main/java/xyz/zcraft/ostella/network/OsuAPI.java | 4 ++-- src/main/java/xyz/zcraft/ostella/network/Router.java | 3 +++ src/main/java/xyz/zcraft/ostella/network/WebServer.java | 2 +- src/main/java/xyz/zcraft/ostella/util/RequestUtil.java | 8 ++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/xyz/zcraft/ostella/network/OsuAPI.java b/src/main/java/xyz/zcraft/ostella/network/OsuAPI.java index b9b04b6..f1c3ac9 100644 --- a/src/main/java/xyz/zcraft/ostella/network/OsuAPI.java +++ b/src/main/java/xyz/zcraft/ostella/network/OsuAPI.java @@ -534,14 +534,14 @@ public static User getSelf(String auth) { if (response.statusCode() >= 400) { throw new ApiException( ErrorCode.USER_FETCH_FAILED, - "osu! API returned status " + response.statusCode() + " for friend list" + "osu! API returned status " + response.statusCode() + " for self data" ); } final var json = JsonParser.parseString(response.body()).getAsJsonObject(); return GSON.fromJson(json, User.class); } catch (IOException | InterruptedException e) { - throw new ApiException(ErrorCode.USER_FETCH_FAILED, "Network failed to get friend list", e); + throw new ApiException(ErrorCode.USER_FETCH_FAILED, "Network failed to get self data", e); } } } diff --git a/src/main/java/xyz/zcraft/ostella/network/Router.java b/src/main/java/xyz/zcraft/ostella/network/Router.java index c131b7f..4126969 100644 --- a/src/main/java/xyz/zcraft/ostella/network/Router.java +++ b/src/main/java/xyz/zcraft/ostella/network/Router.java @@ -339,6 +339,9 @@ public void getCurrentRoomItem(@NotNull Context context) { }) .thenApply((MultiplayerRoom.CurrentPlaylistItem c) -> { final BeatmapExtended beatmap = c.getBeatmap(); + if (beatmap == null) { + throw new ApiException(ErrorCode.NO_BEATMAP_FOUND, "Beatmap is null!"); + } JsonObject res = new JsonObject(); res.addProperty("beatmap_id", beatmap.getId()); res.addProperty("beatmapset_id", beatmap.getBeatmapsetId()); diff --git a/src/main/java/xyz/zcraft/ostella/network/WebServer.java b/src/main/java/xyz/zcraft/ostella/network/WebServer.java index 26206b5..70f3f30 100644 --- a/src/main/java/xyz/zcraft/ostella/network/WebServer.java +++ b/src/main/java/xyz/zcraft/ostella/network/WebServer.java @@ -71,7 +71,7 @@ public WebServer(AppConfig conf, TokenManager tokenManager) throws IOException { .get("/replays/{jobId}/video/replay.mp4", router.replayController::getReplayRenderResultFile) .delete("/replays/{jobId}/video", router.replayController::deleteReplayRenderResult); } else { - LOG.info("Replay rendering will is disabled."); + LOG.info("Replay rendering is disabled."); } cfg.routes diff --git a/src/main/java/xyz/zcraft/ostella/util/RequestUtil.java b/src/main/java/xyz/zcraft/ostella/util/RequestUtil.java index f7c4bf1..9e1ad8f 100644 --- a/src/main/java/xyz/zcraft/ostella/util/RequestUtil.java +++ b/src/main/java/xyz/zcraft/ostella/util/RequestUtil.java @@ -40,14 +40,10 @@ public static String optionalString(Context context, String param) throws ApiExc } public static long requireLong(Context context, String param) throws ApiException { - return parseLong(context.queryParam(param)); - } - - public static long parseLong(String s) throws ApiException { try { - return Long.parseLong(Objects.requireNonNull(s)); + return Long.parseLong(Objects.requireNonNull(context.queryParam(param))); } catch (Exception e) { - throw new ApiException(ErrorCode.ILLEGAL_ARGUMENT, "Invalid parameter: " + s); + throw new ApiException(ErrorCode.ILLEGAL_ARGUMENT, "Invalid parameter: " + param); } }