X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FHttp%2FControllers%2FEpisodeController.php;h=4e93427836287daea50cf6645cfaa638c5d22b59;hb=212561cf1c6724b52c490104f5a2b4c3418b1c62;hp=9892cee7b2a88f0eca0848a26f78ca15e8fb6426;hpb=a18446cc7494f59388c6f07d59138de9373a8ccf;p=alttp.git diff --git a/app/Http/Controllers/EpisodeController.php b/app/Http/Controllers/EpisodeController.php index 9892cee..4e93427 100644 --- a/app/Http/Controllers/EpisodeController.php +++ b/app/Http/Controllers/EpisodeController.php @@ -8,6 +8,7 @@ use App\Models\EpisodeCrew; use App\Models\User; use Carbon\Carbon; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class EpisodeController extends Controller { @@ -194,13 +195,13 @@ class EpisodeController extends Controller 'event' => 'nullable|array', 'event.*' => 'numeric', ]); - $after = isset($validatedData['after']) ? $validatedData['after'] : Carbon::now()->sub(2, 'hours'); + $after = isset($validatedData['after']) ? $validatedData['after'] : Carbon::now(); $before = isset($validatedData['before']) ? $validatedData['before'] : Carbon::now()->add(1, 'days'); $episodes = Episode::with(['channels', 'event', 'players', 'players.user']) ->select('episodes.*') ->join('events', 'episodes.event_id', '=', 'events.id') ->where('episodes.confirmed', '=', true) - ->where('episodes.start', '>=', $after) + ->where(DB::raw('DATE_ADD(`episodes`.`start`, INTERVAL COALESCE(`episodes`.`estimate`, 0) SECOND)'), '>=', $after) ->where('episodes.start', '<=', $before) ->where('events.visible', '=', true) ->orderBy('episodes.start')