Merge branch 'master' into feature/discussions-unset-scroll-padding-e…

…xtra-on-sticky-focus
ppy · Oct 6, 2023 · 3704f0e · 3704f0e
2 parents 75bd610 + a5beb1b
commit 3704f0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/app/Http/Controllers/ArtistsController.php b/app/Http/Controllers/ArtistsController.php
@@ -39,19 +39,31 @@ public function show($id)
         $albums = $artist->albums()
             ->where('visible', true)
             ->orderBy('id', 'desc')
-            ->with(['tracks' => function ($query) {
-                $query->orderBy('display_order', 'ASC');
-            }])
-            ->with('tracks.artist')
+            ->with(['tracks' => fn ($q) => $q
+                    ->orderBy('display_order', 'asc')
+                    ->orderBy('exclusive', 'desc')
+                    ->orderBy('id', 'asc'),
+            ])
             ->get();
 
         $tracks = $artist
             ->tracks()
             ->whereNull('album_id')
-            ->with('artist')
+            ->orderBy('display_order', 'asc')
+            ->orderBy('exclusive', 'desc')
             ->orderBy('id', 'desc')
             ->get();
 
+        foreach ($albums as $album) {
+            foreach ($album->tracks as $track) {
+                $track->setRelation('album', $album);
+                $track->setRelation('artist', $artist);
+            }
+        }
+        foreach ($tracks as $track) {
+            $track->setRelation('artist', $artist);
+        }
+
         $images = [
             'header_url' => $artist->header_url,
             'cover_url' => $artist->cover_url,

diff --git a/app/Http/Controllers/Multiplayer/RoomsController.php b/app/Http/Controllers/Multiplayer/RoomsController.php
@@ -170,7 +170,7 @@ public function show($id)
 
         $playlistItemsQuery = $room->playlist();
         if ($room->isRealtime()) {
-            $playlistItemsQuery->whereHas('scores');
+            $playlistItemsQuery->whereHas('scoreLinks');
         }
         $beatmaps = $playlistItemsQuery->with('beatmap.beatmapset.beatmaps')->get()->pluck('beatmap');
         $beatmapsets = $beatmaps->pluck('beatmapset');