* Suggestions: Keep suggestions within the current playlist

1 files changed, 6 insertions, 2 deletions

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]));
     }
 
     /**