merge changes from RetroAchievements#1936

.env.example

@@ -13,6 +13,10 @@ FORWARD_MAILPIT_PORT=64051
 FORWARD_MEILISEARCH_PORT=64060
 FORWARD_PHPMYADMIN_PORT=64080
 
+# Feature Flags
+
+FEATURE_BEAT=true
+
 # Application
 
 APP_NAME=RetroAchievements
@@ -88,11 +92,6 @@ MAIL_PASSWORD="${DB_USERNAME}"
 MAIL_FROM_ADDRESS=[email protected]
 MAIL_FROM_NAME="${APP_NAME}"
 
-# Feature Flags
-
-FEATURE_BEAT=true
-FEATURE_AGGREGATE_QUERIES=true
-
 # Providers
 
 CLAMAV_SKIP_VALIDATION=true

app/Helpers/database/player-game.php

@@ -695,59 +695,3 @@ function getGameTopAchievers(int $gameID): array
 
     return $retval;
 }
-
-function getMostPopularGames(int $offset, int $count, int $method): array
-{
-    $retval = [];
-
-    if ($method == 0) {
-        // By num awards given:
-        $query = "    SELECT gd.ID, gd.Title, gd.ConsoleID, gd.ForumTopicID, gd.Flags, gd.ImageIcon, gd.ImageTitle, gd.ImageIngame, gd.ImageBoxArt, gd.Publisher, gd.Developer, gd.Genre, gd.Released, gd.IsFinal, gd.TotalTruePoints, c.Name AS ConsoleName,     SUM(NumTimesAwarded) AS NumRecords
-                    FROM GameData AS gd
-                    LEFT JOIN Console AS c ON c.ID = gd.ConsoleID
-                    LEFT OUTER JOIN (
-                        SELECT
-                            COALESCE(aw.cnt, 0) AS NumTimesAwarded,
-                            GameID
-                        FROM
-                            Achievements AS ach
-                        LEFT OUTER JOIN (
-                            SELECT
-                                AchievementID,
-                                count(*) cnt
-                            FROM
-                                Awarded
-                            GROUP BY
-                                AchievementID) aw ON ach.ID = aw.AchievementID
-                        GROUP BY
-                            ach.ID) aw ON aw.GameID = gd.ID
-                    GROUP BY gd.ID
-                    ORDER BY NumRecords DESC
-                    LIMIT $offset, $count";
-    } else {
-        return $retval;
-        // $query = "    SELECT COUNT(*) AS NumRecords, Inner1.*
-        //         FROM
-        //         (
-        //             SELECT gd.ID, gd.Title, gd.ConsoleID, gd.ForumTopicID, gd.Flags, gd.ImageIcon, gd.ImageTitle, gd.ImageIngame, gd.ImageBoxArt, gd.Publisher, gd.Developer, gd.Genre, gd.Released, gd.IsFinal, gd.TotalTruePoints, c.Name AS ConsoleName
-        //             FROM Activity AS act
-        //             LEFT JOIN GameData AS gd ON gd.ID = act.data
-        //             LEFT JOIN Console AS c ON c.ID = gd.ConsoleID
-        //             WHERE act.activitytype = " . AchievementFlag::OfficialCore . " AND !ISNULL( gd.ID )
-        //             GROUP BY gd.ID, act.User
-        //         ) AS Inner1
-        //         GROUP BY Inner1.ID
-        //         ORDER BY NumRecords DESC
-        //         LIMIT $offset, $count";
-    }
-
-    $dbResult = s_mysql_query($query);
-
-    if ($dbResult !== false) {
-        while ($data = mysqli_fetch_assoc($dbResult)) {
-            $retval[] = $data;
-        }
-    }
-
-    return $retval;
-}

app/Platform/AppServiceProvider.php

@@ -13,9 +13,7 @@
 use App\Platform\Commands\SyncLeaderboardEntries;
 use App\Platform\Commands\SyncLeaderboards;
 use App\Platform\Commands\SyncMemoryNotes;
-use App\Platform\Commands\SyncPlayerAchievements;
 use App\Platform\Commands\SyncPlayerBadges;
-use App\Platform\Commands\SyncPlayerGames;
 use App\Platform\Commands\SyncPlayerRichPresence;
 use App\Platform\Commands\SyncPlayerSession;
 use App\Platform\Commands\UnlockPlayerAchievement;
@@ -91,8 +89,6 @@ public function boot(): void
                 SyncLeaderboards::class,
                 SyncLeaderboardEntries::class,
                 SyncMemoryNotes::class,
-                SyncPlayerAchievements::class,
-                SyncPlayerGames::class,
                 SyncPlayerBadges::class,
                 SyncPlayerRichPresence::class,
                 SyncPlayerSession::class,

app/Platform/Commands/UpdateGamePlayerGames.php

@@ -4,7 +4,7 @@
 
 namespace App\Platform\Commands;
 
-use App\Platform\Actions\UpdateGamePlayerGames as UpdateOutdatedPlayerGameMetricsAction;
+use App\Platform\Actions\UpdateGamePlayerGames as UpdatePlayerGameMetricsAction;
 use App\Platform\Models\Game;
 use Illuminate\Console\Command;
 
@@ -15,7 +15,7 @@ class UpdateGamePlayerGames extends Command
     protected $description = "Update game(s) outdated player game metrics";
 
     public function __construct(
-        private readonly UpdateOutdatedPlayerGameMetricsAction $updateOutdatedPlayerGameMetrics
+        private readonly UpdatePlayerGameMetricsAction $updatePlayerGameMetrics
     ) {
         parent::__construct();
     }
@@ -31,7 +31,7 @@ public function handle(): void
         $progressBar->start();
 
         foreach ($games as $game) {
-            $this->updateOutdatedPlayerGameMetrics->execute($game);
+            $this->updatePlayerGameMetrics->execute($game);
             $progressBar->advance();
         }
 

config/sync.php

@@ -304,43 +304,6 @@
         //     ],
         // ],
 
-        /*
-         * Awarded             60000k    incremental by Date
-         *
-         * Populates player_achievements and player_games
-         *
-         * @see \App\Platform\Commands\SyncPlayerAchievements
-         */
-        'player_achievements' => [
-            'model' => PlayerAchievement::class,
-            'strategy' => SyncStrategy::UPSERT,
-            'reference_model' => PlayerAchievementLegacy::class,
-            'reference_key' => 'Date',
-            'unique_key' => ['user_id', 'achievement_id'],
-            'require' => [
-            ],
-            'map' => [
-                /* no map. everything is handled in preProcessEntity */
-            ],
-        ],
-
-        /*
-         * syncing from Activity (type 3 = started playing) is too expensive
-         * sync from player achievements instead
-         */
-        'player_games' => [
-            'model' => PlayerGame::class,
-            'strategy' => SyncStrategy::UPSERT,
-            'reference_model' => PlayerAchievement::class,
-            'reference_key' => PlayerAchievement::CREATED_AT,
-            'unique_key' => ['user_id', 'game_id'],
-            'require' => [
-            ],
-            'map' => [
-                /* no map. everything is handled in preProcessEntity */
-            ],
-        ],
-
         /*
          * SiteAwards            106k    incremental by AwardDate
          */