diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte index bddb79ce..203ba120 100644 --- a/AquaNet/src/pages/UserHome.svelte +++ b/AquaNet/src/pages/UserHome.svelte @@ -35,9 +35,6 @@ console.log(trend) console.log(music) - // Sort recent by date - user.recent.sort((a, b) => b.playDate < a.playDate ? -1 : 1) - d = {user, trend, recent: user.recent.map(it => {return {...music[it.musicId], ...it}})} localStorage.setItem("tmp-user-details", JSON.stringify(d)) renderCal(calElement, trend.map(it => {return {date: it.date, value: it.plays}})) diff --git a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt b/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt index d4b0401e..c1986955 100644 --- a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt +++ b/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt @@ -53,7 +53,7 @@ interface GenericUserDataRepo : JpaRepository { interface IGenericGamePlaylog { val musicId: Int val level: Int - val date: Any + val userPlayDate: Any val achievement: Int val maxCombo: Int val isFullCombo: Boolean @@ -102,7 +102,7 @@ fun genericUserSummary( lastSeen = user.lastPlayDate.toString(), lastVersion = user.lastRomVersion, ratingComposition = ratingComposition, - recent = plays.sortedBy { it.date.toString() }.takeLast(15) + recent = plays.sortedBy { it.userPlayDate.toString() }.takeLast(15).reversed() ) } diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java index 8509b498..45ddac46 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java @@ -162,12 +162,6 @@ public class UserPlaylog implements Serializable, IGenericGamePlaylog { return playerRating; } - @NotNull - @Override - public String getDate() { - return playDate.toString(); - } - @Override public int getBeforeRating() { return playerRating; // TODO: Get before rating diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java index 5cdf11cf..25617dd5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java @@ -265,12 +265,6 @@ public class UserPlaylog implements Serializable, IGenericGamePlaylog { @JsonProperty("extBool1") private boolean extBool1; - @NotNull - @Override - public Object getDate() { - return playDate; - } - @Override public boolean isFullCombo() { return maxCombo == totalCombo; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java index 9fb23c6a..00224613 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java @@ -160,12 +160,6 @@ public class UserPlaylog implements Serializable, IGenericGamePlaylog { private int battlePoint; - @NotNull - @Override - public Object getDate() { - return playDate; - } - @Override public int getAchievement() { return techScore;