prosongsa - Backend for songs.zachdecook.com

Backend for songs.zachdecook.com

Clone

HTTPS

Diffstat (limited to 'laravel/app/Http/Controllers/SongController.php')

-rw-r--r--

1 files changed, 6 insertions, 1 deletions

diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php
index 8e043ac..83c9601 100644
--- a/laravel/app/Http/Controllers/SongController.php
+++ b/laravel/app/Http/Controllers/SongController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;

use App\Playlist;

use App\Song;

use App\Suggestion;

+use App\User;

use Illuminate\Http\Request;

class SongController extends Controller

@@ -14,7 +15,7 @@ class SongController extends Controller

$song = Song::where('number', $song )->first();

return redirect()->route('song.show', ['song' => $song ] );

}

- public function show( Song $song, Request $request )

+ public function show( Song $song, Request $request, User $user )

{

$lines = explode( "\n", $song['text'] );

$newText = '';

@@ -67,6 +68,10 @@ class SongController extends Controller

$params['suggestions'] = $playlist->songs()->inRandomOrder()->limit(5)->get();

} else {

$params['suggestions'] = Song::inRandomOrder()->limit(5)->get();

+ $plName = ($user->name ?? 'anon') . 'favs';

+ if(! $song->playlists()->where('name',$plName)->exists()){

+ $params['addToPlaylist'] = ($user->name ?? 'anon') . 'favs';

+ }

}

foreach ($params['suggestions'] as $sugSong){

$sug = Suggestion::firstOrNew(['from' => $song->id, 'song' => $sugSong->id]);