Refactor score handling, enhance display, and update version

README.md

@@ -105,12 +105,12 @@ Image endpoints return PNG bytes. Replay download returns `video/mp4`.
 
 ### Beatmaps
 
-| Method | Path                                 | Purpose                        | Params / POST Body                                 | Response |
-|--------|--------------------------------------|--------------------------------|----------------------------------------------------|----------|
-| GET    | `/beatmaps/lookup`                   | Resolve beatmap IDs            | See section below                                  | JSON     |
-| GET    | `/beatmaps/{beatmapId}`              | Beatmap card image             | path `beatmapId` (+ optional query param `mod`)    | PNG      |
-| GET    | `/beatmaps/{beatmapId}/analysis`     | PP+ and object-pattern analysis | path `beatmapId` (+ optional query param `mod`)   | PNG      |
-| POST   | `/beatmaps/{beatmapId}/leaderboards` | Compare players on one beatmap | path `beatmapId` + POST Body `{"uids":[user ids]}` | PNG      |
+| Method | Path                                 | Purpose                         | Params / POST Body                                 | Response |
+|--------|--------------------------------------|---------------------------------|----------------------------------------------------|----------|
+| GET    | `/beatmaps/lookup`                   | Resolve beatmap IDs             | See section below                                  | JSON     |
+| GET    | `/beatmaps/{beatmapId}`              | Beatmap card image              | path `beatmapId` (+ optional query param `mod`)    | PNG      |
+| GET    | `/beatmaps/{beatmapId}/analysis`     | PP+ and object-pattern analysis | path `beatmapId` (+ optional query param `mod`)    | PNG      |
+| POST   | `/beatmaps/{beatmapId}/leaderboards` | Compare players on one beatmap  | path `beatmapId` + POST Body `{"uids":[user ids]}` | PNG      |
 
 ### Beatmapsets
 
@@ -123,14 +123,16 @@ Image endpoints return PNG bytes. Replay download returns `video/mp4`.
 
 ### Scores
 
-| Method | Path                                             | Purpose                        | Params / POST Body         | Response |
-|--------|--------------------------------------------------|--------------------------------|----------------------------|----------|
-| GET    | `/scores/lookup`                                 | Resolve score IDs              | See section below          | JSON     |
-| GET    | `/scores/{scoreId}`                              | Score card image               | path `scoreId`             | PNG      |
-| GET    | `/scores/{scoreId}/analysis`                     | Score analysis card image      | path `scoreId`             | PNG      |
-| GET    | `/scores/{scoreId}/highlight`                    | 20s highlight range of a score | path `scoreId`             | JSON     |
-| GET    | `/scores/{scoreId}/misses`                       | List the misses of the score   | path `scoreId`             | JSON     |
-| GET    | `/scores/{scoreId}/misses/{missIndex}/visualize` | Visualize misses               | path `scoreId` `missIndex` | PNG      |
+| Method | Path                                             | Purpose                             | Params / POST Body              | Response |
+|--------|--------------------------------------------------|-------------------------------------|---------------------------------|----------|
+| GET    | `/scores/lookup`                                 | Resolve score IDs                   | See section below               | JSON     |
+| GET    | `/scores/random`                                 | Get a random score                  | `min_rank`                      | JSON     |
+| POST   | `/scores/random/users`                           | Get a random score from given users | POST Body `{"uids":[user ids]}` | JSON     |
+| GET    | `/scores/{scoreId}`                              | Score card image                    | path `scoreId`                  | PNG      |
+| GET    | `/scores/{scoreId}/analysis`                     | Score analysis card image           | path `scoreId`                  | PNG      |
+| GET    | `/scores/{scoreId}/highlight`                    | 20s highlight range of a score      | path `scoreId`                  | JSON     |
+| GET    | `/scores/{scoreId}/misses`                       | List the misses of the score        | path `scoreId`                  | JSON     |
+| GET    | `/scores/{scoreId}/misses/{missIndex}/visualize` | Visualize misses                    | path `scoreId` `missIndex`      | PNG      |
 
 ### Multiplayer Rooms
 
@@ -141,15 +143,15 @@ Image endpoints return PNG bytes. Replay download returns `video/mp4`.
 
 ### Users
 
-| Method | Path                            | Purpose                   | Params / POST Body               | Response |
-|--------|---------------------------------|---------------------------|----------------------------------|----------|
-| POST   | `/users`                        | Get multiple user data    | POST Body `{"ids":[user ids]}`   | JSON     |
-| GET    | `/users/me`                     | User data                 | Requires Authorization Header    | JSON     |
-| GET    | `/users/me/friends`             | Friends list for user     | Requires Authorization Header    | JSON     |
-| POST   | `/users/leaderboards`           | User PP leaderboard image | `{"uids":[user ids]}`            | PNG      |
-| GET    | `/users/{userId}/scores/bestof` | Best-of-N scores image    | path `userId`, query `n` (count) | PNG      |
-| GET    | `/users/{userId}/scores/recent` | Recent scores image       | path `userId`, query `n` (count) | PNG      |
-| GET    | `/users/{userId}/scores/today-best` | Best scores achieved recently | path `userId`, optional query `days` (default 1) | PNG |
+| Method | Path                                | Purpose                       | Params / POST Body                               | Response |
+|--------|-------------------------------------|-------------------------------|--------------------------------------------------|----------|
+| POST   | `/users`                            | Get multiple user data        | POST Body `{"ids":[user ids]}`                   | JSON     |
+| GET    | `/users/me`                         | User data                     | Requires Authorization Header                    | JSON     |
+| GET    | `/users/me/friends`                 | Friends list for user         | Requires Authorization Header                    | JSON     |
+| POST   | `/users/leaderboards`               | User PP leaderboard image     | `{"uids":[user ids]}`                            | PNG      |
+| GET    | `/users/{userId}/scores/bestof`     | Best-of-N scores image        | path `userId`, query `n` (count)                 | PNG      |
+| GET    | `/users/{userId}/scores/recent`     | Recent scores image           | path `userId`, query `n` (count)                 | PNG      |
+| GET    | `/users/{userId}/scores/today-best` | Best scores achieved recently | path `userId`, optional query `days` (default 1) | PNG      |
 
 ### Replays (enabled when `replayRender.enabled` is true)
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.BotSeira</groupId>
     <artifactId>oStella</artifactId>
-    <version>1.11.1</version>
+    <version>1.11.5</version>
 
     <properties>
         <maven.compiler.source>25</maven.compiler.source>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.github.BotSeira</groupId>
             <artifactId>osuParser</artifactId>
-            <version>v1.5.1</version>
+            <version>v1.5.2</version>
         </dependency>
 
         <!-- Source: https://mvnrepository.com/artifact/org.tukaani/xz -->

src/main/java/xyz/zcraft/ostella/data/ScoreFilter.java

@@ -1,5 +1,6 @@
 package xyz.zcraft.ostella.data;
 
+import xyz.zcraft.ostella.service.CacheService;
 import xyz.zcraft.osu.model.Mod;
 import xyz.zcraft.osu.model.Score;
 
@@ -14,7 +15,7 @@
 /** A validated filter applied to a score-list response. */
 public final class ScoreFilter {
     private static final Pattern FILTER_PATTERN = Pattern.compile(
-            "(?i)^(acc(?:uracy)?|combo|pp|time|length|len|star|stars|sr|bpm|miss|misses|score|mod|mods|rank"
+            "(?i)^(acc(?:uracy)?|combo|pp|time|length|len|star|stars|sr|bpm|miss|misses|score|mod|mods|rank|replay"
                     + "|title|artist|mapper|genre|language|video|storyboard|fullcombo)"
                     + "(>=|<=|!=|!~|>|<|=|~)(.+)$"
     );
@@ -228,7 +229,7 @@ private static String formatValue(Field field, double value) {
             case BPM -> formatNumber(value) + " BPM";
             case MISS -> formatNumber(value) + " miss";
             case SCORE -> formatNumber(value);
-            case MODS, RANK, TITLE, ARTIST, MAPPER, GENRE, LANGUAGE, VIDEO, STORYBOARD, FULL_COMBO ->
+            case MODS, RANK, TITLE, ARTIST, MAPPER, GENRE, LANGUAGE, VIDEO, STORYBOARD, FULL_COMBO, REPLAY ->
                     throw new IllegalStateException("Text filter has no numeric value");
         };
     }
@@ -274,6 +275,7 @@ public boolean matches(Score score) {
                     && compareText(score.getBeatmapset().getLanguage().getName());
             case VIDEO -> score.getBeatmapset() != null && compareBoolean(score.getBeatmapset().getVideo());
             case STORYBOARD -> score.getBeatmapset() != null && compareBoolean(score.getBeatmapset().getStoryboard());
+            case REPLAY -> compareBoolean(score.getHasReplay() || CacheService.hasReplayCache(score.getId()));
             case FULL_COMBO -> compareBoolean(score.getIsPerfectCombo());
         };
     }
@@ -343,7 +345,7 @@ private boolean compareText(String... actualValues) {
     private boolean compareBoolean(Boolean actual) {
         if (actual == null) return false;
         boolean equal = actual == Boolean.parseBoolean(textValues.iterator().next());
-        return operator == Operator.EQUAL ? equal : !equal;
+        return (operator == Operator.EQUAL) == equal;
     }
 
     public String displayText() {
@@ -368,6 +370,7 @@ private enum Field {
         LANGUAGE("Language"),
         VIDEO("Video"),
         STORYBOARD("Storyboard"),
+        REPLAY("Replay"),
         FULL_COMBO("Full combo");
 
         private final String label;
@@ -395,6 +398,7 @@ static Field from(String value) {
                 case "language" -> LANGUAGE;
                 case "video" -> VIDEO;
                 case "storyboard" -> STORYBOARD;
+                case "replay" -> REPLAY;
                 case "fullcombo" -> FULL_COMBO;
                 default -> throw new IllegalArgumentException("Unknown filter field: " + value);
             };
@@ -405,7 +409,7 @@ boolean isMetadataText() {
         }
 
         boolean isBoolean() {
-            return this == VIDEO || this == STORYBOARD || this == FULL_COMBO;
+            return this == VIDEO || this == STORYBOARD || this == FULL_COMBO || this == REPLAY;
         }
     }
 

src/main/java/xyz/zcraft/ostella/network/WebServer.java

@@ -58,6 +58,9 @@ public WebServer(AppConfig conf, TokenManager tokenManager) throws IOException {
 
                     .get("/scores/lookup", router.scoreController::lookupScore)
                     .get("/scores/random", router.scoreController::randomScore)
+                    .post("/scores/random/users", router.scoreController::randomScoreFromUsers)
+                    .get("/scores/random/users/{userId}/weights", router.scoreController::randomScoreFromUsersWeights)
+                    .post("/scores/random/users/{userId}/weights", router.scoreController::randomScoreFromUsersWeights)
                     .get("/scores/{scoreId}", router.scoreController::renderScoreById)
                     .get("/scores/{scoreId}/analysis", router.analyzeController::renderScoreAnalysisById)
                     .get("/scores/{scoreId}/highlight", router.analyzeController::getScoreHighlight)
@@ -77,6 +80,7 @@ public WebServer(AppConfig conf, TokenManager tokenManager) throws IOException {
                     .post("/users/leaderboards", router.leaderboardController::getLeaderboard)
                     .post("/users/scores/recent/batch", router.userController::getRecentScoresBatch)
                     .get("/users/{userId}", router.userController::getUserInfo)
+                    .get("/users/{userId}/rank", router.userController::getUserRank)
                     .get("/users/{userId}/scores/bestof", router.userController::getBestOfN)
                     .get("/users/{userId}/scores/recent", router.userController::getRecentScores)
                     .get("/users/{userId}/scores/today-best", router.userController::getTodayBestScores)

src/main/java/xyz/zcraft/ostella/network/controller/AnalyzeController.java

@@ -19,6 +19,7 @@
 import xyz.zcraft.ostella.service.MissVisualizeService;
 import xyz.zcraft.ostella.service.RenderService;
 import xyz.zcraft.ostella.util.TokenManager;
+import xyz.zcraft.ostella.util.format.ScoreFormatUtil;
 import xyz.zcraft.osu.model.BeatmapExtended;
 import xyz.zcraft.osu.model.Mod;
 import xyz.zcraft.osu.model.Score;
@@ -34,6 +35,7 @@
 
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -299,6 +301,31 @@ public void renderScoreAnalysisById(@NotNull Context context) {
                         throw new ApiException(ErrorCode.SCORE_PARSE_FAILED, e);
                     }
 
+                    boolean isLazerScore =
+                            osuReplay.gameVersion() > 30000001
+                                    && score.getMods().stream()
+                                    .map(Mod::getAcronym)
+                                    .noneMatch(s -> Objects.equals(s, "CL") || Objects.equals(s, "V2"));
+
+                    HashMap<HitEvent.HitResult, Integer> simResult = new HashMap<>();
+                    analyze.events().stream()
+                            .filter(e -> e.eventType().equals(HitEvent.EventType.HIT_CIRCLE)
+                                    || e.eventType().equals(HitEvent.EventType.SLIDER_HEAD))
+                            .forEach(e -> simResult.merge(e.hitResult(), 1, Integer::sum));
+
+                    final Integer simGreat = simResult.getOrDefault(HitEvent.HitResult.PERFECT, 0);
+                    final Integer simOk = simResult.getOrDefault(HitEvent.HitResult.OK, 0);
+                    final Integer simMeh = simResult.getOrDefault(HitEvent.HitResult.MEH, 0);
+                    final Integer simMiss = simResult.getOrDefault(HitEvent.HitResult.MISS, 0);
+
+                    String simHitResult = simGreat + " / " + simOk + " / " + simMeh + " / " + simMiss;
+
+                    boolean doSimMatch =
+                            simGreat == ScoreFormatUtil.getGreatCount(score)
+                            && simOk == ScoreFormatUtil.getOkCount(score)
+                            && simMeh == ScoreFormatUtil.getMehCount(score)
+                            && simMiss == ScoreFormatUtil.getMissCount(score);
+
                     return perfPlusApi.calculate(score)
                             .exceptionally(error -> {
                                 LOG.warn("Could not calculate performance+ for score {}. "
@@ -309,7 +336,7 @@ public void renderScoreAnalysisById(@NotNull Context context) {
                             .thenApply(performancePlus -> new ScoreAnalyzeData(
                                     score, diffSpec, hitErrors, hitPos, hitPosAbs,
                                     missPos, missPosAbs, aimBias, avgTimingError, analyze,
-                                    performanceGraph, performancePlus));
+                                    performanceGraph, performancePlus, isLazerScore, doSimMatch, simHitResult));
                 })
                 .thenApplyAsync(renderer::renderScoreAnalysis, renderer.getRenderExecutor())
                 .thenAccept(bytes -> context.status(200).result(bytes)));
@@ -406,7 +433,10 @@ public record ScoreAnalyzeData(
             double avgTimingError,
             ReplayAnalyze replayAnalyze,
             PerformanceGraphData performanceGraph,
-            PerfPlusApi.PerformancePlus performancePlus
+            PerfPlusApi.PerformancePlus performancePlus,
+            boolean isLazerScore,
+            boolean doSimMatch,
+            String simHitResult
     ) {
     }
 

src/main/java/xyz/zcraft/ostella/network/controller/ReplayController.java

@@ -206,7 +206,11 @@ public void renderShowcaseOfUsers(@NotNull Context context) {
             List<CompletableFuture<Score>> scoreFutures = new ArrayList<>(ids.stream()
                     .filter(id -> !id.startsWith("s"))
                     .map(id -> {
-                        if (id.startsWith("u")) return id.substring(1);
+                        if (id.startsWith("u")) {
+                            return id.substring(1);
+                        } else if (id.startsWith("@")) {
+                            return String.valueOf(executor.enqueueAsync(() -> OsuAPI.getUser(tokenManager.getTokenData(), id.substring(1))).join().getId());
+                        }
                         return id;
                     })
                     .map(Long::parseLong)