Merge branch 'achievement-distribution-indexes' of https://github.com…

…/wescopeland/RAWeb into achievement-distribution-indexes
RetroAchievements · Oct 30, 2023 · 9a6bba2 · 9a6bba2
2 parents 921d9bb + fc8d432
commit 9a6bba2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 46 deletions.
diff --git a/.env.example b/.env.example
@@ -56,7 +56,7 @@ DB_USERNAME=retroachievements
 DB_PASSWORD="${DB_USERNAME}"
 # TODO remove after utf8mb4 conversion
 #DB_CHARSET=latin1
-#DB_COLLATION=latin1_general_ci
+#DB_COLLATION=latin1_swedish_ci
 
 #LEGACY_MEDIA_PATH=
 

diff --git a/app/Api/Middleware/LogApiUsage.php b/app/Api/Middleware/LogApiUsage.php
@@ -15,7 +15,6 @@ public function handle(Request $request, Closure $next): mixed
         /** @var User $user */
         $user = $request->user('api-token');
 
-        $user->timestamps = false;
         $user->increment('APIUses');
 
         return $next($request);

diff --git a/app/Helpers/database/ticket.php b/app/Helpers/database/ticket.php
@@ -9,41 +9,23 @@
 use App\Community\ViewModels\Ticket as TicketViewModel;
 use App\Platform\Enums\AchievementFlag;
 use App\Platform\Enums\UnlockMode;
+use App\Platform\Models\PlayerGame;
 use App\Site\Models\User;
 use App\Support\Cache\CacheKey;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
-function isAllowedToSubmitTickets(string $user): bool
+function isAllowedToSubmitTickets(string $username): bool
 {
-    if (!isValidUsername($user)) {
+    $user = User::firstWhere('User', $username);
+    if (!$user || $user->Created->diffInDays() < 1) {
         return false;
     }
 
-    $cacheKey = CacheKey::buildUserCanTicketCacheKey($user);
-
-    $value = Cache::get($cacheKey);
-    if ($value !== null) {
-        return $value;
-    }
-
-    $value = getUserActivityRange($user, $firstLogin, $lastLogin)
-        && time() - strtotime($firstLogin) > 86400 // 86400 seconds = 1 day
-        && getRecentlyPlayedGames($user, 0, 1, $userInfo)
-        && $userInfo[0]['GameID'];
-
-    if ($value) {
-        // if the user can create tickets, they should be able to create tickets forever
-        // more. expire once every 30 days so we can purge inactive users
-        Cache::put($cacheKey, $value, Carbon::now()->addDays(30));
-    } else {
-        // user can't create tickets, which means the account is less than a day old
-        // or has no games played. only cache the value for an hour
-        Cache::put($cacheKey, $value, Carbon::now()->addHour());
-    }
-
-    return $value;
+    return PlayerGame::where('user_id', $user->id)
+        ->where('time_taken', '>', 5)
+        ->exists();
 }
 
 function submitNewTicketsJSON(

diff --git a/app/Helpers/database/user-activity.php b/app/Helpers/database/user-activity.php
@@ -90,7 +90,6 @@ function postActivity(string|User $userIn, int $type, ?int $data = null, ?int $d
     // update UserAccount
     $user->LastLogin = Carbon::now();
     $user->LastActivityID = $activity->ID;
-    $user->timestamps = false;
     $user->save();
 
     return true;

diff --git a/app/Helpers/database/user-auth.php b/app/Helpers/database/user-auth.php
@@ -78,7 +78,6 @@ function authenticateForConnect(?string $username, ?string $pass = null, ?string
 
     // update appTokenExpiry
     $user->appTokenExpiry = Carbon::now()->clone()->addDays(14);
-    $user->timestamps = false;
     $user->save();
 
     postActivity($user, ActivityType::Login);
@@ -208,7 +207,6 @@ function authenticateFromCookie(
 
     // valid active account. update the last activity timestamp
     $user->LastLogin = Carbon::now();
-    $user->timestamps = false;
     $user->save();
 
     // validate permissions for the current page if required

diff --git a/app/Support/Cache/CacheKey.php b/app/Support/Cache/CacheKey.php
@@ -16,11 +16,6 @@ public static function buildUserLastLoginCacheKey(string $username): string
         return self::buildNormalizedUserCacheKey($username, "last-login");
     }
 
-    public static function buildUserCanTicketCacheKey(string $username): string
-    {
-        return self::buildNormalizedUserCacheKey($username, "can-ticket");
-    }
-
     public static function buildUserCardDataCacheKey(string $username): string
     {
         return self::buildNormalizedUserCacheKey($username, "card-data");

diff --git a/resources/views/platform/components/game/current-progress/root.blade.php b/resources/views/platform/components/game/current-progress/root.blade.php
@@ -35,9 +35,9 @@
             </div>
         @endif
 
-        <div class="lg:rounded bg-embed border border-embed-highlight p-5 relative">
+        <div class="lg:rounded bg-embed border border-embed-highlight px-5 pt-3.5 pb-5 relative">
             <div class="mb-2">
-                <p class="text-lg">Your Progress</p>
+                <p class="sr-only">Your Progress</p>
 
                 @if (!$hasUnlockedAnyAchievements)
                     <p class="leading-4 mt-2">You haven't unlocked any achievements for this game.</p>

diff --git a/tests/Unit/CacheKeyTest.php b/tests/Unit/CacheKeyTest.php
@@ -10,15 +10,6 @@
 
 final class CacheKeyTest extends TestCase
 {
-    public function testBuildUserCanTicketCacheKey(): void
-    {
-        $username = "UserName";
-
-        $cacheKey = CacheKey::buildUserCanTicketCacheKey($username);
-
-        $this->assertEquals("user:username:can-ticket", $cacheKey);
-    }
-
     public function testBuildUserCardDataCacheKey(): void
     {
         $username = "UserName";