Merge pull request #11126 from nanaya/view-count-replays

Limit replay file downloads count

Author: notbakaneko

Diff for: app/Http/Controllers/ScoresController.php

@@ -7,13 +7,13 @@
 
 use App\Models\Score\Best\Model as ScoreBest;
 use App\Models\Solo\Score as SoloScore;
-use App\Models\UserCountryHistory;
 use App\Transformers\ScoreTransformer;
 use App\Transformers\UserCompactTransformer;
-use Carbon\CarbonImmutable;
 
 class ScoresController extends Controller
 {
+    const REPLAY_DOWNLOAD_COUNT_INTERVAL = 86400; // 1 day
+
     public function __construct()
     {
         parent::__construct();
@@ -52,20 +52,30 @@ public function download($rulesetOrSoloId, $id = null)
             abort(404);
         }
 
-        if (\Auth::user()->getKey() !== $score->user_id) {
-            $score->user->statistics($score->getMode(), true)->increment('replay_popularity');
-
-            $month = CarbonImmutable::now();
-            $currentMonth = UserCountryHistory::formatDate($month);
-
-            $score->user->replaysWatchedCounts()
-                ->firstOrCreate(['year_month' => $currentMonth], ['count' => 0])
-                ->incrementInstance('count');
-
-            if ($score instanceof ScoreBest) {
-                $score->replayViewCount()
-                    ->firstOrCreate([], ['play_count' => 0])
-                    ->incrementInstance('play_count');
+        $currentUser = \Auth::user();
+        if (
+            !$currentUser->isRestricted()
+            && $currentUser->getKey() !== $score->user_id
+            && ($currentUser->token()?->client->password_client ?? false)
+        ) {
+            $countLock = \Cache::lock(
+                "view:score_replay:{$score->getKey()}:{$currentUser->getKey()}",
+                static::REPLAY_DOWNLOAD_COUNT_INTERVAL,
+            );
+
+            if ($countLock->get()) {
+                $score->user->statistics($score->getMode(), true)->increment('replay_popularity');
+
+                $currentMonth = format_month_column(new \DateTime());
+                $score->user->replaysWatchedCounts()
+                    ->firstOrCreate(['year_month' => $currentMonth], ['count' => 0])
+                    ->incrementInstance('count');
+
+                if ($score instanceof ScoreBest) {
+                    $score->replayViewCount()
+                        ->firstOrCreate([], ['play_count' => 0])
+                        ->incrementInstance('play_count');
+                }
             }
         }
 

Diff for: app/Libraries/User/CountryChangeTarget.php

@@ -10,7 +10,6 @@
 use App\Models\Tournament;
 use App\Models\TournamentRegistration;
 use App\Models\User;
-use App\Models\UserCountryHistory;
 use Carbon\CarbonImmutable;
 
 class CountryChangeTarget
@@ -38,8 +37,8 @@ public static function get(User $user): ?string
             ->userCountryHistory()
             ->whereBetween('year_month', [
                 // one year maximum range. Offset by 1 because the range is inclusive
-                UserCountryHistory::formatDate($until->subMonths(11)),
-                UserCountryHistory::formatDate($until),
+                format_month_column($until->subMonths(11)),
+                format_month_column($until),
             ])->distinct()
             ->orderBy('year_month', 'DESC')
             ->limit($minMonths)

Diff for: app/Models/Solo/Score.php

@@ -19,9 +19,9 @@
 use App\Models\ScoreToken;
 use App\Models\Traits;
 use App\Models\User;
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Database\Eloquent\Builder;
 use LaravelRedis;
-use Storage;
 
 /**
  * @property float $accuracy
@@ -127,6 +127,16 @@ public static function extractParams(array $rawParams, ScoreToken|MultiplayerSco
         return $params;
     }
 
+    public static function replayFileDiskName(): string
+    {
+        return "{$GLOBALS['cfg']['osu']['score_replays']['storage']}-solo-replay";
+    }
+
+    public static function replayFileStorage(): Filesystem
+    {
+        return \Storage::disk(static::replayFileDiskName());
+    }
+
     public function beatmap()
     {
         return $this->belongsTo(Beatmap::class, 'beatmap_id');
@@ -253,8 +263,7 @@ public function getMode(): string
 
     public function getReplayFile(): ?string
     {
-        return Storage::disk($GLOBALS['cfg']['osu']['score_replays']['storage'].'-solo-replay')
-            ->get($this->getKey());
+        return static::replayFileStorage()->get($this->getKey());
     }
 
     public function isLegacy(): bool

Diff for: app/Models/UserCountryHistory.php

@@ -28,11 +28,6 @@ class UserCountryHistory extends Model
     protected $primaryKeys = ['user_id', 'year_month', 'country_acronym'];
     protected $table = 'user_country_history';
 
-    public static function formatDate(\DateTimeInterface $date): string
-    {
-        return $date->format('ym');
-    }
-
     public function country(): BelongsTo
     {
         return $this->belongsTo(Country::class, 'country_acronym');
@@ -46,7 +41,7 @@ public function user(): BelongsTo
     public function setYearMonthAttribute(\DateTimeInterface|string $value): void
     {
         $this->attributes['year_month'] = $value instanceof \DateTimeInterface
-            ? static::formatDate($value)
+            ? format_month_column($value)
             : $value;
     }
 }

Diff for: app/helpers.php

@@ -395,6 +395,11 @@ function flag_url($countryCode)
     return "/assets/images/flags/{$baseFileName}.svg";
 }
 
+function format_month_column(\DateTimeInterface $date): string
+{
+    return $date->format('ym');
+}
+
 function format_rank(?int $rank): string
 {
     return $rank !== null ? '#'.i18n_number_format($rank) : '-';

Diff for: database/factories/Solo/ScoreFactory.php

@@ -45,6 +45,15 @@ public function withData(array ...$overrides): static
         ]);
     }
 
+    public function withReplay(): static
+    {
+        return $this
+            ->state(['has_replay' => true])
+            ->afterCreating(function ($score) {
+                Score::replayFileStorage()->put($score->getKey(), 'placeholder replay file');
+            });
+    }
+
     private function makeData(?array $overrides = null): callable
     {
         return fn (array $attr): array => array_map(