From 36b20054f2f0a2afe9d358cc1a7a8c8235606d1a Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Mon, 2 Sep 2019 09:45:52 -0400 Subject: * Suggestions: Keep suggestions within the current playlist --- laravel/app/Http/Controllers/SongController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'laravel/app/Http/Controllers') diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php index 669ec3e..2074104 100644 --- a/laravel/app/Http/Controllers/SongController.php +++ b/laravel/app/Http/Controllers/SongController.php @@ -63,7 +63,11 @@ class SongController extends Controller $params['back'] = Song::where('id', '<', $song->id)->orderBy('id', 'desc')->first(); $params['next'] = Song::where('id', '>', $song->id)->orderBy('id', 'asc' )->first(); } - $params['suggestions'] = Song::inRandomOrder()->limit(5)->get(); + if ($playlist){ + $params['suggestions'] = $playlist->songs()->inRandomOrder()->limit(5)->get(); + } else { + $params['suggestions'] = Song::inRandomOrder()->limit(5)->get(); + } foreach ($params['suggestions'] as $sugSong){ $sug = Suggestion::firstOrNew(['from' => $song->id, 'song' => $sugSong->id]); $sug->shown++; @@ -77,7 +81,7 @@ class SongController extends Controller $sug->clicks++; $sug->save(); //Suggestion::make(['song' => $song, 'from' => $from]); - return redirect(route('song.show', ['song' => $song, 'key' => $request->key])); + return redirect(route('song.show', ['song' => $song, 'key' => $request->key, 'playlist' => $request->playlist])); } /** -- cgit 1.4.1