Fix scores set with unranked mods showing as processing indefinitely (again)

app/Http/Controllers/BeatmapsController.php

@@ -75,7 +75,7 @@ private static function beatmapScores(string $id, ?string $scoreTransformerType,
             'type' => $type,
             'user' => $currentUser,
         ]);
-        $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country']);
+        $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country', 'processHistory']);
         $userScore = $esFetch->userBest();
         $scoreTransformer = new ScoreTransformer($scoreTransformerType);
 
@@ -494,7 +494,7 @@ public function userScoreAll($beatmapId, $userId)
             'sort' => 'score_desc',
             'user_id' => (int) $userId,
         ]);
-        $scores = (new ScoreSearch($params))->records();
+        $scores = (new ScoreSearch($params))->records()->loadMissing('processHistory');
 
         return [
             'scores' => json_collection($scores, new ScoreTransformer()),

app/Models/Solo/Score.php

@@ -149,6 +149,11 @@ public function user()
         return $this->belongsTo(User::class, 'user_id');
     }
 
+    public function processHistory()
+    {
+        return $this->hasOne(ScoreProcessHistory::class, 'score_id');
+    }
+
     public function scopeDefault(Builder $query): Builder
     {
         return $query->whereHas('beatmap.beatmapset');
@@ -243,6 +248,7 @@ public function getAttribute($key)
 
             'beatmap',
             'performance',
+            'processHistory',
             'reportedIn',
             'user' => $this->getRelationValue($key),
         };

app/Models/Solo/ScoreProcessHistory.php

@@ -0,0 +1,25 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Models\Solo;
+
+use App\Models\Model;
+
+/**
+ * @property int $score_id
+ * @property int $processed_version
+ * @property \Carbon\Carbon $processed_at
+ */
+class ScoreProcessHistory extends Model
+{
+    protected $table = 'score_process_history';
+
+    public function score()
+    {
+        return $this->belongsTo(Score::class, 'score_id');
+    }
+}

app/Transformers/ScoreTransformer.php

@@ -24,6 +24,7 @@ class ScoreTransformer extends TransformerAbstract
     // warning: the preload is actually for PlaylistItemUserHighScore, not for Score
     const MULTIPLAYER_BASE_PRELOAD = [
         'scoreLink.score',
+        'scoreLink.score.processHistory',
         'scoreLink.user.country',
     ];
 
@@ -37,6 +38,7 @@ class ScoreTransformer extends TransformerAbstract
         'beatmap.beatmapset',
         // it's for user profile so the user is already available
         // 'user',
+        'processHistory',
     ];
 
     protected array $availableIncludes = [
@@ -102,6 +104,7 @@ public function transformSolo(MultiplayerScoreLink|ScoreModel|SoloScore $score)
         if ($score instanceof SoloScore) {
             $extraAttributes['ranked'] = $score->ranked;
             $extraAttributes['preserve'] = $score->preserve;
+            $extraAttributes['processed'] = $score->legacy_score_id !== null || $score->processHistory !== null;
         }
 
         $hasReplay = $score->has_replay;

resources/js/interfaces/solo-score-json.ts

@@ -41,6 +41,7 @@ type SoloScoreJsonDefaultAttributes = {
   passed: boolean;
   pp: number | null;
   preserve?: boolean;
+  processed?: boolean;
   rank: Rank;
   ranked?: boolean;
   ruleset_id: number;

resources/js/scores/pp-value.tsx

@@ -21,12 +21,12 @@ export default function PpValue(props: Props) {
   if (!isBest && !isSolo) {
     title = trans('scores.status.non_best');
     content = '-';
-  } else if (props.score.ranked === false) {
+  } else if (props.score.ranked === false || props.score.preserve === false) {
     title = trans('scores.status.no_pp');
     content = '-';
   } else if (props.score.pp == null) {
-    if (isSolo && !props.score.passed) {
-      title = trans('scores.status.non_passing');
+    if (isSolo && props.score.processed === true) {
+      title = trans('scores.status.no_pp');
       content = '-';
     } else {
       title = trans('scores.status.processing');

resources/lang/en/scores.php

@@ -25,7 +25,6 @@
 
     'status' => [
         'non_best' => 'Only personal best scores award pp',
-        'non_passing' => 'Only passing scores award pp',
         'no_pp' => 'pp is not awarded for this score',
         'processing' => 'This score is still being calculated and will be displayed soon',
         'no_rank' => 'This score has no rank as it is unranked or marked for deletion',