X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FHttp%2FControllers%2FEpisodeController.php;h=6de7d676a496c6b6ee6aaa89ccff01d9540a5b42;hb=9f54b6e8fde827556cf858818090a1dfc829624c;hp=d4ca78d44b27bf3b6e5b02cc9485edc2ca7853c0;hpb=dec43db11e9433f5bfcfaa091518082559cb3169;p=alttp.git diff --git a/app/Http/Controllers/EpisodeController.php b/app/Http/Controllers/EpisodeController.php index d4ca78d..6de7d67 100644 --- a/app/Http/Controllers/EpisodeController.php +++ b/app/Http/Controllers/EpisodeController.php @@ -13,17 +13,33 @@ class EpisodeController extends Controller $validatedData = $request->validate([ 'after' => 'nullable|date', 'before' => 'nullable|date', + 'event' => 'nullable|array', + 'event.*' => 'numeric', ]); $after = isset($validatedData['after']) ? $validatedData['after'] : Carbon::now()->sub(2, 'hours'); $before = isset($validatedData['before']) ? $validatedData['before'] : Carbon::now()->add(1, 'days'); - $episodes = Episode::with(['event', 'players', 'players.user']) + $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('episodes.start', '<=', $before) ->where('events.visible', '=', true) + ->orderBy('episodes.start') ->limit(1000); + if (!empty($validatedData['event'])) { + $episodes = $episodes->whereIn('episodes.event_id', $validatedData['event']); + } + if ($request->user() && $request->user()->isPrivileged()) { + $episodes = $episodes->with(['crew', 'crew.user']); + } else { + $episodes = $episodes->with([ + 'crew' => function ($query) { + $query->where('confirmed', true); + }, + 'crew.user', + ]); + } return $episodes->get()->toJson(); }