refactor: Rename DXStar to DXScoreRank for consistent terminology

Yushu2606 · Yushu2606 · commit 37b4436e9f9b · 2026-04-09T17:20:18.000+08:00
- Rename the DXStar property in CommonRecord to DXScoreRank
- Rename the DXStarScoreFilter filter to DXScoreRankScoreFilter
- Update field references in all related models and processors
- Ensure consistency in serialization and deserialization logic
diff --git a/src/Prober/Common/CommonRecord.cs b/src/Prober/Common/CommonRecord.cs
@@ -14,7 +14,7 @@ public record CommonRecord
 
     public required int DXScore { get; init; }
 
-    public required int DXStar { get; init; }
+    public required int DXScoreRank { get; init; }
 
     public required int DXRating { get; init; }
 
diff --git a/src/Prober/DivingFish/Models/Record.cs b/src/Prober/DivingFish/Models/Record.cs
@@ -72,9 +72,9 @@ public class Record
 
     public int TotalDXScore => (_totalDXScore ??= new(() => Song.Charts[DifficultyIndex].Notes.Total * 3)).Value;
 
-    private Lazy<int>? _dxStar;
+    private Lazy<int>? _dxScoreRank;
 
-    public int DXStar => (_dxStar ??= new(() => ((double)DXScore / TotalDXScore) switch
+    public int DXScoreRank => (_dxScoreRank ??= new(() => ((double)DXScore / TotalDXScore) switch
     {
         < 0.9 => 1,
         < 0.93 => 2,
@@ -115,7 +115,7 @@ public static implicit operator CommonRecord(Record record)
             Rank = record.Rank,
             Achievements = record.Achievements,
             DXRating = record.DXRating,
-            DXStar = record.DXStar,
+            DXScoreRank = record.DXScoreRank,
             DXScore = record.DXScore
         };
     }
diff --git a/src/Prober/Lxns/Models/Record.cs b/src/Prober/Lxns/Models/Record.cs
@@ -24,7 +24,7 @@ public record Record : SimpleRecord
     public required int DXScore { get; init; }
 
     [JsonPropertyName("dx_star")]
-    public required int DXStar { get; init; }
+    public required int DXScoreRank { get; init; }
 
     [JsonPropertyName("dx_rating")]
     public double? DXRating { get; init; }
@@ -108,7 +108,7 @@ public static implicit operator CommonRecord(Record record)
             Rank = record.Rank ?? Ranks.D,
             Achievements = record.Achievements,
             DXRating = (int)(record.DXRating ?? 0),
-            DXStar = record.DXStar,
+            DXScoreRank = record.DXScoreRank,
             DXScore = record.DXScore
         };
     }
diff --git a/src/Render/Drawer.cs b/src/Render/Drawer.cs
@@ -20,7 +20,7 @@ public async Task<Image> DrawBestsAsync(CommonUser user, IReadOnlyList<CommonRec
         int everMin = ever.Count > 0 ? ever[^1].DXRating : 0;
         int currentMax = current.Count > 0 ? current[0].DXRating : 0;
         int currentMin = current.Count > 0 ? current[^1].DXRating : 0;
-        bool mayMask = ever.Any(r => r.DXScore is 0 && (r.DXStar > 0 || r.Rank > Ranks.A)) || current.Any(r => r.DXScore is 0 && (r.DXStar > 0 || r.Rank > Ranks.A));
+        bool mayMask = ever.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 || r.Rank > Ranks.A)) || current.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 || r.Rank > Ranks.A));
         Dictionary<string, object?> scope = new(StringComparer.OrdinalIgnoreCase)
         {
             ["userInfo"] = user,
diff --git a/src/ScoreFilter/DXStarScoreFilter.cs b/src/ScoreFilter/DXStarScoreFilter.cs
@@ -3,15 +3,15 @@
 namespace Limekuma.ScoreFilter;
 
 [ScoreFilterTag("dx_star")]
-public sealed class DXStarScoreFilter : IScoreFilter
+public sealed class DXScoreRankScoreFilter : IScoreFilter
 {
     public Func<CommonRecord, bool> GetFilter(string? condition)
     {
-        if (!int.TryParse(condition, out int dxStar))
+        if (!int.TryParse(condition, out int dxScoreRank))
         {
             return _ => true;
         }
 
-        return x => x.DXStar >= dxStar;
+        return x => x.DXScoreRank >= dxScoreRank;
     }
 }
diff --git a/src/ScoreProcesser/DxScoreScoreProcesser.cs b/src/ScoreProcesser/DxScoreScoreProcesser.cs
@@ -10,7 +10,7 @@ public sealed class DxScoreScoreProcesser : IScoreProcesser
 {
     public (ImmutableArray<CommonRecord>, ImmutableArray<CommonRecord>) Process(IReadOnlyList<CommonRecord> records)
     {
-        if (records.Any(r => r.DXScore is 0 && (r.DXStar > 0 || r.Rank > Ranks.A)))
+        if (records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 || r.Rank > Ranks.A)))
         {
             throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));
         }
@@ -40,7 +40,7 @@ public sealed class DxScoreScoreProcesser : IScoreProcesser
                 Chart = record.Chart,
                 ComboFlag = record.ComboFlag,
                 DXScore = record.DXScore,
-                DXStar = record.DXStar,
+                DXScoreRank = record.DXScoreRank,
                 Rank = rank,
                 SyncFlag = record.SyncFlag
             };
diff --git a/src/ScoreProcesser/FitLevelScoreProcesser.cs b/src/ScoreProcesser/FitLevelScoreProcesser.cs
@@ -11,7 +11,7 @@ public sealed class FitLevelScoreProcesser : IScoreProcesser
 {
     public (ImmutableArray<CommonRecord>, ImmutableArray<CommonRecord>) Process(IReadOnlyList<CommonRecord> records)
     {
-        if (records.Any(r => r.DXScore is 0 && (r.DXStar > 0 || r.Rank > Ranks.A)))
+        if (records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 || r.Rank > Ranks.A)))
         {
             throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));
         }
@@ -44,7 +44,7 @@ public sealed class FitLevelScoreProcesser : IScoreProcesser
                 },
                 ComboFlag = record.ComboFlag,
                 DXScore = record.DXScore,
-                DXStar = record.DXStar,
+                DXScoreRank = record.DXScoreRank,
                 Rank = record.Rank,
                 SyncFlag = record.SyncFlag
             };
diff --git a/src/ScoreProcesser/OldScoreProcesser.cs b/src/ScoreProcesser/OldScoreProcesser.cs
@@ -10,7 +10,7 @@ public sealed class OldScoreProcesser : IScoreProcesser
 {
     public (ImmutableArray<CommonRecord>, ImmutableArray<CommonRecord>) Process(IReadOnlyList<CommonRecord> records)
     {
-        if (records.Any(r => r.DXScore is 0 && (r.DXStar > 0 || r.Rank > Ranks.A)))
+        if (records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 || r.Rank > Ranks.A)))
         {
             throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));
         }
@@ -28,7 +28,7 @@ public sealed class OldScoreProcesser : IScoreProcesser
                 Chart = record.Chart,
                 ComboFlag = record.ComboFlag,
                 DXScore = record.DXScore,
-                DXStar = record.DXStar,
+                DXScoreRank = record.DXScoreRank,
                 Rank = record.Rank,
                 SyncFlag = record.SyncFlag
             };
diff --git a/src/Services/DfListService.cs b/src/Services/DfListService.cs
@@ -35,7 +35,7 @@ public override async Task GetFromDivingFish(DivingFishListRequest request,
         user.IconId = request.Icon;
 
         (Func<CommonRecord, bool> predicate, bool maskMutex) = ScoreFilterHelper.GetPredicateByTags(request.Tags, request.Condition);
-        bool mayMask = player.Records.Any(r => r.DXScore is 0 && (r.DXStar > 0 || r.Rank > Ranks.A));
+        bool mayMask = player.Records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 || r.Rank > Ranks.A));
         if (mayMask && maskMutex)
         {
             throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));
diff --git a/src/Services/LxnsListService.cs b/src/Services/LxnsListService.cs
@@ -51,7 +51,7 @@ public override async Task GetFromLxns(LxnsListRequest request, IServerStreamWri
         }
 
         (Func<CommonRecord, bool> predicate, bool maskMutex) = ScoreFilterHelper.GetPredicateByTags(request.Tags, request.Condition);
-        bool mayMask = records.Any(r => r.DXScore is 0 && (r.DXStar > 0 || r.Rank > Ranks.A));
+        bool mayMask = records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 || r.Rank > Ranks.A));
         if (mayMask && maskMutex)
         {
             throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public async Task<Image> DrawBestsAsync(CommonUser user, IReadOnlyList<CommonRec`
`20`	`20`	`int everMin = ever.Count > 0 ? ever[^1].DXRating : 0;`
`21`	`21`	`int currentMax = current.Count > 0 ? current[0].DXRating : 0;`
`22`	`22`	`int currentMin = current.Count > 0 ? current[^1].DXRating : 0;`
`23`		`- bool mayMask = ever.Any(r => r.DXScore is 0 && (r.DXStar > 0 \|\| r.Rank > Ranks.A)) \|\| current.Any(r => r.DXScore is 0 && (r.DXStar > 0 \|\| r.Rank > Ranks.A));`
	`23`	`+ bool mayMask = ever.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 \|\| r.Rank > Ranks.A)) \|\| current.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 \|\| r.Rank > Ranks.A));`
`24`	`24`	`Dictionary<string, object?> scope = new(StringComparer.OrdinalIgnoreCase)`
`25`	`25`	`{`
`26`	`26`	`["userInfo"] = user,`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,15 @@`
`3`	`3`	`namespace Limekuma.ScoreFilter;`
`4`	`4`
`5`	`5`	`[ScoreFilterTag("dx_star")]`
`6`		`-public sealed class DXStarScoreFilter : IScoreFilter`
	`6`	`+public sealed class DXScoreRankScoreFilter : IScoreFilter`
`7`	`7`	`{`
`8`	`8`	`public Func<CommonRecord, bool> GetFilter(string? condition)`
`9`	`9`	`{`
`10`		`- if (!int.TryParse(condition, out int dxStar))`
	`10`	`+ if (!int.TryParse(condition, out int dxScoreRank))`
`11`	`11`	`{`
`12`	`12`	`return _ => true;`
`13`	`13`	`}`
`14`	`14`
`15`		`- return x => x.DXStar >= dxStar;`
	`15`	`+ return x => x.DXScoreRank >= dxScoreRank;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public sealed class DxScoreScoreProcesser : IScoreProcesser`
`10`	`10`	`{`
`11`	`11`	`public (ImmutableArray<CommonRecord>, ImmutableArray<CommonRecord>) Process(IReadOnlyList<CommonRecord> records)`
`12`	`12`	`{`
`13`		`- if (records.Any(r => r.DXScore is 0 && (r.DXStar > 0 \|\| r.Rank > Ranks.A)))`
	`13`	`+ if (records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 \|\| r.Rank > Ranks.A)))`
`14`	`14`	`{`
`15`	`15`	`throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));`
`16`	`16`	`}`
`@@ -40,7 +40,7 @@ public sealed class DxScoreScoreProcesser : IScoreProcesser`
`40`	`40`	`Chart = record.Chart,`
`41`	`41`	`ComboFlag = record.ComboFlag,`
`42`	`42`	`DXScore = record.DXScore,`
`43`		`- DXStar = record.DXStar,`
	`43`	`+ DXScoreRank = record.DXScoreRank,`
`44`	`44`	`Rank = rank,`
`45`	`45`	`SyncFlag = record.SyncFlag`
`46`	`46`	`};`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public sealed class FitLevelScoreProcesser : IScoreProcesser`
`11`	`11`	`{`
`12`	`12`	`public (ImmutableArray<CommonRecord>, ImmutableArray<CommonRecord>) Process(IReadOnlyList<CommonRecord> records)`
`13`	`13`	`{`
`14`		`- if (records.Any(r => r.DXScore is 0 && (r.DXStar > 0 \|\| r.Rank > Ranks.A)))`
	`14`	`+ if (records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 \|\| r.Rank > Ranks.A)))`
`15`	`15`	`{`
`16`	`16`	`throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));`
`17`	`17`	`}`
`@@ -44,7 +44,7 @@ public sealed class FitLevelScoreProcesser : IScoreProcesser`
`44`	`44`	`},`
`45`	`45`	`ComboFlag = record.ComboFlag,`
`46`	`46`	`DXScore = record.DXScore,`
`47`		`- DXStar = record.DXStar,`
	`47`	`+ DXScoreRank = record.DXScoreRank,`
`48`	`48`	`Rank = record.Rank,`
`49`	`49`	`SyncFlag = record.SyncFlag`
`50`	`50`	`};`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public sealed class OldScoreProcesser : IScoreProcesser`
`10`	`10`	`{`
`11`	`11`	`public (ImmutableArray<CommonRecord>, ImmutableArray<CommonRecord>) Process(IReadOnlyList<CommonRecord> records)`
`12`	`12`	`{`
`13`		`- if (records.Any(r => r.DXScore is 0 && (r.DXStar > 0 \|\| r.Rank > Ranks.A)))`
	`13`	`+ if (records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 \|\| r.Rank > Ranks.A)))`
`14`	`14`	`{`
`15`	`15`	`throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));`
`16`	`16`	`}`
`@@ -28,7 +28,7 @@ public sealed class OldScoreProcesser : IScoreProcesser`
`28`	`28`	`Chart = record.Chart,`
`29`	`29`	`ComboFlag = record.ComboFlag,`
`30`	`30`	`DXScore = record.DXScore,`
`31`		`- DXStar = record.DXStar,`
	`31`	`+ DXScoreRank = record.DXScoreRank,`
`32`	`32`	`Rank = record.Rank,`
`33`	`33`	`SyncFlag = record.SyncFlag`
`34`	`34`	`};`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public override async Task GetFromDivingFish(DivingFishListRequest request,`
`35`	`35`	`user.IconId = request.Icon;`
`36`	`36`
`37`	`37`	`(Func<CommonRecord, bool> predicate, bool maskMutex) = ScoreFilterHelper.GetPredicateByTags(request.Tags, request.Condition);`
`38`		`- bool mayMask = player.Records.Any(r => r.DXScore is 0 && (r.DXStar > 0 \|\| r.Rank > Ranks.A));`
	`38`	`+ bool mayMask = player.Records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 \|\| r.Rank > Ranks.A));`
`39`	`39`	`if (mayMask && maskMutex)`
`40`	`40`	`{`
`41`	`41`	`throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public override async Task GetFromLxns(LxnsListRequest request, IServerStreamWri`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`(Func<CommonRecord, bool> predicate, bool maskMutex) = ScoreFilterHelper.GetPredicateByTags(request.Tags, request.Condition);`
`54`		`- bool mayMask = records.Any(r => r.DXScore is 0 && (r.DXStar > 0 \|\| r.Rank > Ranks.A));`
	`54`	`+ bool mayMask = records.Any(r => r.DXScore is 0 && (r.DXScoreRank > 0 \|\| r.Rank > Ranks.A));`
`55`	`55`	`if (mayMask && maskMutex)`
`56`	`56`	`{`
`57`	`57`	`throw new RpcException(new(StatusCode.PermissionDenied, "Mask enabled"));`