Merge pull request ppy#10943 from nanaya/pin-pass

Adjust score pinning behaviour
venix12 · Feb 1, 2024 · 1055da3 · 1055da3
2 parents 0f0b689 + 6f29aef
commit 1055da3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/app/Http/Controllers/ScorePinsController.php b/app/Http/Controllers/ScorePinsController.php
@@ -9,6 +9,7 @@
 use App\Libraries\MorphMap;
 use App\Models\Beatmap;
 use App\Models\ScorePin;
+use App\Models\Solo;
 use Exception;
 
 class ScorePinsController extends Controller
@@ -100,6 +101,10 @@ public function store()
                     throw $ex;
                 }
             }
+
+            if ($score instanceof Solo\Score) {
+                $score->update(['preserve' => true]);
+            }
         }
 
         return response()->noContent();

diff --git a/app/Libraries/OsuAuthorize.php b/app/Libraries/OsuAuthorize.php
@@ -1937,6 +1937,10 @@ public function checkScorePin(?User $user, ScoreBest|Solo\Score $score): string
             return $prefix.'not_owner';
         }
 
+        if (!$score->passed) {
+            return $prefix.'failed';
+        }
+
         if ($score instanceof Solo\Score && $GLOBALS['cfg']['osu']['user']['hide_pinned_solo_scores']) {
             return $prefix.'disabled_type';
         }

diff --git a/resources/js/core/user/score-pins.ts b/resources/js/core/user/score-pins.ts
@@ -30,7 +30,7 @@ export default class ScorePins {
   }
 
   canBePinned(score: SoloScoreJson) {
-    return score.current_user_attributes.pin != null;
+    return score.current_user_attributes.pin != null && score.passed;
   }
 
   isPinned(score: SoloScoreJson) {

diff --git a/resources/lang/en/authorization.php b/resources/lang/en/authorization.php
@@ -173,6 +173,7 @@
     'score' => [
         'pin' => [
             'disabled_type' => "Can't pin this type of score",
+            'failed' => "Can't pin non-passing score.",
             'not_owner' => 'Only score owner can pin score.',
             'too_many' => 'Pinned too many scores.',
         ],