]> git.localhorst.tv Git - alttp.git/commitdiff
fix content type of json controllers
authorDaniel Karbach <daniel.karbach@localhorst.tv>
Mon, 8 Dec 2025 12:30:37 +0000 (13:30 +0100)
committerDaniel Karbach <daniel.karbach@localhorst.tv>
Mon, 8 Dec 2025 12:30:37 +0000 (13:30 +0100)
19 files changed:
app/Http/Controllers/AlttpSeedController.php
app/Http/Controllers/ApplicationController.php
app/Http/Controllers/ChannelController.php
app/Http/Controllers/ChatBotLogController.php
app/Http/Controllers/DiscordBotController.php
app/Http/Controllers/DiscordChannelController.php
app/Http/Controllers/DiscordGuildController.php
app/Http/Controllers/EpisodeController.php
app/Http/Controllers/EventController.php
app/Http/Controllers/ProtocolController.php
app/Http/Controllers/ResultController.php
app/Http/Controllers/RoundController.php
app/Http/Controllers/StepLadderModeController.php
app/Http/Controllers/TechniqueController.php
app/Http/Controllers/TournamentController.php
app/Http/Controllers/UserController.php
app/Models/Episode.php
app/Models/Event.php
app/Models/Technique.php

index 571a44a1f947741d4149c23c89d29ae5ccd08ed4..f512fa4c7357e3806f1e867bbb619061bf1f157e 100644 (file)
@@ -19,7 +19,7 @@ class AlttpSeedController extends Controller
                        $seed->makeHidden('settings');
                }
 
-               return $seed->toJson();
+               return $seed->toArray();
        }
 
        public function retry($hash) {
@@ -31,7 +31,7 @@ class AlttpSeedController extends Controller
                        Artisan::call('alttp:generate '.intval($seed->id));
                }
 
-               return $seed->toJson();
+               return $seed->toArray();
        }
 
 }
index b0ab06362b94c3e76cc324656a1cca8845c144d6..e7be90369bb22e850c00729490075bf64050fbea 100644 (file)
@@ -26,7 +26,7 @@ class ApplicationController extends Controller
 
                Protocol::applicationAccepted($application->tournament, $application, $request->user());
 
-               return $participant->toJson();
+               return $participant->toArray();
        }
 
        public function reject(Request $request, Application $application) {
@@ -38,7 +38,7 @@ class ApplicationController extends Controller
 
                Protocol::applicationRejected($application->tournament, $application, $request->user());
 
-               return $application->toJson();
+               return $application->toArray();
        }
 
 }
index 4de8baa34ce6ca6bad6d04e5c070644f1b359cb6..d7bc398fa4a096d4f08fda2c9166d1c74ad3cd2c 100644 (file)
@@ -103,7 +103,7 @@ class ChannelController extends Controller {
                        ->orderBy('created_at', 'DESC')
                        ->limit(150)
                        ->get();
-               return $log->values()->toJson();
+               return $log->values()->toArray();
        }
 
        public function chatSettings(Request $request, Channel $channel) {
@@ -314,7 +314,7 @@ class ChannelController extends Controller {
                if (Gate::allows('editRestream', $channel)) {
                        $this->unhideChannel($channel);
                }
-               return $channel->toJson();
+               return $channel->toArray();
        }
 
        protected function sendChannels(Collection $channels) {
@@ -323,7 +323,7 @@ class ChannelController extends Controller {
                                $this->unhideChannel($channel);
                        }
                }
-               return $channels->toJson();
+               return $channels->toArray();
        }
 
        private function unhideChannel(Channel $channel) {
index 041be3ce21042f934cd47c107af15f1144dcd438..d9116ec62c945520f8a8513a89e9a6d827cf4ab1 100644 (file)
@@ -10,7 +10,7 @@ class ChatBotLogController extends Controller {
 
        public function search(Request $request) {
                $logs = ChatBotLog::with(['channel', 'origin', 'user'])->orderBy('created_at', 'DESC')->limit(50);
-               return $logs->get()->toJson();
+               return $logs->get()->toArray();
        }
 
        public function getContext(ChatBotLog $entry) {
index ed1150caca7698c8a37ba74bd52ca42727c2217f..f92977e6e8f1a2d77c00788e4dec879de6cc94ef 100644 (file)
@@ -24,7 +24,7 @@ class DiscordBotController extends Controller
                $channel = DiscordChannel::findOrFail($validatedData['channel']);
                $this->authorize('manage', $channel->guild);
                $cmd = DiscordBotCommand::sendMessage($channel, $validatedData['text'], $request->user());
-               return $cmd->toJson();
+               return $cmd->toArray();
        }
 
 }
index de4ff543853ed6d203f83153b59bd0a6caa94895..039c5b79c402e70655a1fbeae6f5abce0adf5005 100644 (file)
@@ -32,13 +32,13 @@ class DiscordChannelController extends Controller
                        $channels->whereIn('type', $validatedData['types']);
                }
                $channels->orderBy('position');
-               return $channels->get()->toJson();
+               return $channels->get()->toArray();
        }
 
        public function single(Request $request, $channel_id) {
                $channel = DiscordChannel::where('channel_id', '=', $channel_id)->firstOrFail();
                $this->authorize('view', $channel);
-               return $channel->toJson();
+               return $channel->toArray();
        }
 
 }
index 59c09045326f3049417b81ff2d53d0b2c22a45e0..04ffa1e2a92097464072cee73e7e8905709e472d 100644 (file)
@@ -27,13 +27,13 @@ class DiscordGuildController extends Controller
                        $guilds->where('name', 'LIKE', '%'.$validatedData['phrase'].'%');
                }
                $guilds->limit(5);
-               return $guilds->get()->toJson();
+               return $guilds->get()->toArray();
        }
 
        public function single(Request $request, $guild_id) {
                $guild = DiscordGuild::where('guild_id', '=', $guild_id)->firstOrFail();
                $this->authorize('view', $guild);
-               return $guild->toJson();
+               return $guild->toArray();
        }
 
        public function manageCrew(Request $request, $guild_id) {
@@ -62,7 +62,7 @@ class DiscordGuildController extends Controller
                        $crew->delete();
                }
 
-               return $guild->fresh()->toJson();
+               return $guild->fresh()->toArray();
        }
 
        public function subscriptions(Request $request, $guild_id) {
@@ -77,7 +77,7 @@ class DiscordGuildController extends Controller
                        'user_subscriptions.user',
                ])->where('guild_id', '=', $guild_id)->firstOrFail();
                $this->authorize('view', $guild);
-               return $guild->toJson();
+               return $guild->toArray();
        }
 
        public function manageSubscriptions(Request $request, $guild_id) {
@@ -134,7 +134,7 @@ class DiscordGuildController extends Controller
                        'user_subscriptions.user',
                ]);
 
-               return $guild->toJson();
+               return $guild->toArray();
        }
 
 }
index b9bbb5c1d115056e5700058e60067134e7d4f8b5..c2d9cc809df5df9a5b28dbcebd5731cd99471ca7 100644 (file)
@@ -21,7 +21,7 @@ class EpisodeController extends Controller {
                $validatedPlayers = $this->validatePlayers($request);
                $episode = $event->episodes()->create($validatedEpisode);
                $this->syncPlayers($episode, $validatedPlayers);
-               return $episode->toJson();
+               return $episode->toArray();
        }
 
        public function update(Request $request, Episode $episode) {
@@ -30,7 +30,7 @@ class EpisodeController extends Controller {
                $validatedPlayers = $this->validatePlayers($request);
                $episode->update($validatedEpisode);
                $this->syncPlayers($episode, $validatedPlayers);
-               return $episode->toJson();
+               return $episode->toArray();
        }
 
        public function addRestream(Request $request, Episode $episode) {
@@ -58,7 +58,7 @@ class EpisodeController extends Controller {
                $episode->channels()->attach($channel, $validatedProps);
                $episode->touch();
 
-               return $episode->load('channels')->toJson();
+               return $episode->load('channels')->toArray();
        }
 
        public function crewManage(Request $request, Episode $episode) {
@@ -116,7 +116,7 @@ class EpisodeController extends Controller {
 
                $user = $request->user();
                if ($user->isPrivileged()) {
-                       return $episode->load(['crew', 'crew.user'])->toJson();
+                       return $episode->load(['crew', 'crew.user'])->toArray();
                } else {
                        return $episode->load([
                                'crew' => function ($query) use ($user) {
@@ -125,7 +125,7 @@ class EpisodeController extends Controller {
                                        $query->orWhereIn('channel_id', $user->channel_crews->pluck('channel_id'));
                                },
                                'crew.user',
-                       ])->toJson();
+                       ])->toArray();
                }
        }
 
@@ -172,7 +172,7 @@ class EpisodeController extends Controller {
                }
 
                if ($user->isPrivileged()) {
-                       return $episode->load(['crew', 'crew.user'])->toJson();
+                       return $episode->load(['crew', 'crew.user'])->toArray();
                } else {
                        return $episode->load([
                                'crew' => function ($query) use ($user) {
@@ -181,7 +181,7 @@ class EpisodeController extends Controller {
                                        $query->orWhereIn('channel_id', $user->channel_crews->pluck('channel_id'));
                                },
                                'crew.user',
-                       ])->toJson();
+                       ])->toArray();
                }
        }
 
@@ -202,7 +202,7 @@ class EpisodeController extends Controller {
                $episode->channels()->updateExistingPivot($channel, $validatedChanges);
                $episode->touch();
 
-               return $episode->load('channels')->toJson();
+               return $episode->load('channels')->toArray();
        }
 
        public function removeRestream(Request $request, Episode $episode) {
@@ -217,7 +217,7 @@ class EpisodeController extends Controller {
                $episode->channels()->detach($channel);
                $episode->touch();
 
-               return $episode->load('channels')->toJson();
+               return $episode->load('channels')->toArray();
        }
 
        public function search(Request $request) {
@@ -234,15 +234,13 @@ class EpisodeController extends Controller {
                        'offset' => 'numeric',
                        'reverse' => 'boolean',
                ]);
-               $before = isset($validatedData['before']) ? $validatedData['before'] : Carbon::now()->add(1, 'days');
                $limit = isset($validatedData['limit']) ? $validatedData['limit'] : 100;
                $reverse = isset($validatedData['reverse']) ? $validatedData['reverse'] : false;
                $episodes = Episode::with(['channels', 'event', 'players', 'players.user'])
                        ->select('episodes.*')
                        ->join('events', 'episodes.event_id', '=', 'events.id')
                        ->where('events.visible', '=', true)
-                       ->orderBy('episodes.start', $reverse ? 'DESC' : 'ASC')
-                       ->limit(1000);
+                       ->orderBy('episodes.start', $reverse ? 'DESC' : 'ASC');
                if (isset($validatedData['after'])) {
                        $episodes = $episodes->where(
                                DB::raw('DATE_ADD(`episodes`.`start`, INTERVAL COALESCE(`episodes`.`estimate`, 0) SECOND)'),
@@ -302,12 +300,12 @@ class EpisodeController extends Controller {
                        ]);
                }
                $episodes->limit($limit);
-               return $episodes->get()->toJson();
+               return $episodes->get()->toArray();
        }
 
        public function single(Request $request, Episode $episode) {
                $this->authorize('view', $episode);
-               return $episode->toJson();
+               return $episode->toArray();
        }
 
        private function userMaySeeAllEvents(Request $request) {
index 14e746743b8a01afd415e8e0be21f766f1e3169b..e630b8bc381103a75f54b93b4e4a3de37096a3a1 100644 (file)
@@ -59,13 +59,13 @@ class EventController extends Controller
                                $events->with('description');
                        }
                }
-               return $events->get()->toJson();
+               return $events->get()->toArray();
        }
 
        public function single(Request $request, Event $event) {
                $this->authorize('view', $event);
                $event->load('description');
-               return $event->toJson();
+               return $event->toArray();
        }
 
        public function web(Request $request, string $name) {
index 401e6232118a684458a515ba71be91001fa0e601..79784967ba8f39a833d070b2ea4c33bc76947f3e 100644 (file)
@@ -17,7 +17,7 @@ class ProtocolController extends Controller
                        ->orderBy('created_at', 'desc')
                        ->limit(150)
                        ->get();
-               return $protocol->values()->toJson();
+               return $protocol->values()->toArray();
        }
 
        public function forRoundAndRunner(Tournament $tournament, Round $round, User $runner) {
@@ -36,7 +36,7 @@ class ProtocolController extends Controller
                        ->orderBy('created_at', 'desc')
                        ->limit(150)
                        ->get();
-               return $protocol->values()->toJson();
+               return $protocol->values()->toArray();
        }
 
        public function forTournament(Tournament $tournament) {
@@ -47,7 +47,7 @@ class ProtocolController extends Controller
                        ->orderBy('created_at', 'desc')
                        ->limit(150)
                        ->get();
-               return $protocol->values()->toJson();
+               return $protocol->values()->toArray();
        }
 
 }
index d9ab52c62bac6ff45abd2177e12abe280c489cb4..32166ea8374177bb31cc6b523c2d6efaa35216ac 100644 (file)
@@ -89,7 +89,7 @@ class ResultController extends Controller
                        $result->hideResult($request->user());
                }
 
-               return $result->toJson();
+               return $result->toArray();
        }
 
        public function modify(Request $request, Result $result) {
@@ -122,7 +122,7 @@ class ResultController extends Controller
                        $round->tournament->updatePlacement();
                }
 
-               return $result->toJson();
+               return $result->toArray();
        }
 
        public function unverify(Request $request, Result $result) {
@@ -142,7 +142,7 @@ class ResultController extends Controller
                        $request->user(),
                );
 
-               return $result->toJson();
+               return $result->toArray();
        }
 
        public function verify(Request $request, Result $result) {
@@ -162,7 +162,7 @@ class ResultController extends Controller
                        $request->user(),
                );
 
-               return $result->toJson();
+               return $result->toArray();
        }
 
 }
index 1459f52a38693e080d0a59d9f1ab857359379bb4..6814c45fea22128a79a32230ab267cba111d817b 100644 (file)
@@ -59,7 +59,7 @@ class RoundController extends Controller
                        $round,
                        $request->user(),
                );
-               return $round->toJson();
+               return $round->toArray();
        }
 
        public function update(Request $request, Round $round) {
@@ -91,7 +91,7 @@ class RoundController extends Controller
 
                $round->load(['results', 'results.user']);
 
-               return $round->toJson();
+               return $round->toArray();
        }
 
        public function setSeed(Request $request, Round $round) {
@@ -114,7 +114,7 @@ class RoundController extends Controller
 
                $round->load(['results', 'results.user']);
 
-               return $round->toJson();
+               return $round->toArray();
        }
 
        public function getSeed(Request $request, Round $round) {
@@ -164,7 +164,7 @@ class RoundController extends Controller
 
                $round->load(['results', 'results.user']);
 
-               return $round->toJson();
+               return $round->toArray();
        }
 
        public function unlock(Request $request, Round $round) {
@@ -183,7 +183,7 @@ class RoundController extends Controller
 
                $round->load(['results', 'results.user']);
 
-               return $round->toJson();
+               return $round->toArray();
        }
 
        private static $GROUP_NAMES = [
index 3f9121d4835c974b4b9b65c64688ebee5bd47eab..5e0ee7edba4073fbe96be01b078b3faf882fd2bc 100644 (file)
@@ -27,12 +27,12 @@ class StepLadderModeController extends Controller
                        $modes->where('name', 'LIKE', '%'.$validatedData['phrase'].'%');
                }
                $modes->orderBy('name');
-               return $modes->get()->toJson();
+               return $modes->get()->toArray();
        }
 
        public function single(Request $request, StepLadderMode $mode) {
                $mode->load('description');
-               return $mode->toJson();
+               return $mode->toArray();
        }
 
 }
index 27cc53dbf9c3fc555ecb855018c4196f54938cad..5ae40860c9c5c39825e68be82407e696e696dda6 100644 (file)
@@ -15,32 +15,32 @@ class TechniqueController extends Controller
        public function byType(Request $request, $type) {
                $techs = Technique::where('index', true)->where('type', '=', $type);
                $this->applyFilter($request, $techs);
-               return $techs->get()->toJson();
+               return $techs->get()->toArray();
        }
 
        public function byTypeAndName(Request $request, $type, $name) {
                $tech = Technique::where('type', '=', $type)->where('name', '=', $name)->firstOrFail();
                $this->authorize('view', $tech);
                $tech->load(['chapters', 'relations']);
-               return $tech->toJson();
+               return $tech->toArray();
        }
 
        public function forMap($map) {
                $techs = TechniqueMap::with(['technique', 'technique.relations'])->where('map', '=', $map);
 
-               return $techs->get()->toJson();
+               return $techs->get()->toArray();
        }
 
        public function search(Request $request) {
                $techs = Technique::where('index', '=', 1);
                $this->applyFilter($request, $techs);
-               return $techs->get()->toJson();
+               return $techs->get()->toArray();
        }
 
        public function single(Request $request, Technique $tech) {
                $this->authorize('view', $tech);
                $tech->load(['chapters', 'relations']);
-               return $tech->toJson();
+               return $tech->toArray();
        }
 
        public function update(Request $request, Technique $content) {
@@ -66,7 +66,7 @@ class TechniqueController extends Controller
 
                $result = isset($validatedData['parent_id']) ? Technique::findOrFail($validatedData['parent_id']) : $content->fresh();
                $result->load(['chapters', 'relations']);
-               return $result->toJson();
+               return $result->toArray();
        }
 
        public function web(Request $request, $type, $name) {
index ecba817ecc1d1914d9a2f9a6e51454532c48b8a5..9feb0534a02b60ccb31f9848027f476e278c9acf 100644 (file)
@@ -23,7 +23,7 @@ class TournamentController extends Controller
                $application->save();
                ApplicationAdded::dispatch($application);
                Protocol::applicationReceived($tournament, $application, $request->user());
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function single(Request $request, Tournament $tournament) {
@@ -69,7 +69,7 @@ class TournamentController extends Controller
                        TournamentChanged::dispatch($tournament);
                        Protocol::tournamentDiscord($tournament, $request->user());
                }
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function discordSettings(Request $request, Tournament $tournament) {
@@ -89,7 +89,7 @@ class TournamentController extends Controller
                        TournamentChanged::dispatch($tournament);
                        Protocol::tournamentDiscordSettings($tournament, $request->user());
                }
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function moreRounds(Request $request, Tournament $tournament) {
@@ -128,7 +128,7 @@ class TournamentController extends Controller
                        TournamentChanged::dispatch($tournament);
                        Protocol::tournamentSettings($tournament, $request->user());
                }
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function open(Request $request, Tournament $tournament) {
@@ -137,7 +137,7 @@ class TournamentController extends Controller
                $tournament->save();
                TournamentChanged::dispatch($tournament);
                Protocol::tournamentOpened($tournament, $request->user());
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function close(Request $request, Tournament $tournament) {
@@ -146,7 +146,7 @@ class TournamentController extends Controller
                $tournament->save();
                TournamentChanged::dispatch($tournament);
                Protocol::tournamentClosed($tournament, $request->user());
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function lock(Request $request, Tournament $tournament) {
@@ -155,7 +155,7 @@ class TournamentController extends Controller
                $tournament->save();
                TournamentChanged::dispatch($tournament);
                Protocol::tournamentLocked($tournament, $request->user());
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function unlock(Request $request, Tournament $tournament) {
@@ -164,7 +164,7 @@ class TournamentController extends Controller
                $tournament->save();
                TournamentChanged::dispatch($tournament);
                Protocol::tournamentUnlocked($tournament, $request->user());
-               return $tournament->toJson();
+               return $tournament->toArray();
        }
 
        public function selfAssignGroups(Request $request, Tournament $tournament) {
@@ -206,7 +206,7 @@ class TournamentController extends Controller
                        ->whereBelongsTo($tournament)
                        ->whereBelongsTo($user)
                        ->get()
-                       ->toJson();
+                       ->toArray();
        }
 
        public function swapGroup(Request $request, Tournament $tournament) {
@@ -237,7 +237,7 @@ class TournamentController extends Controller
                        ->whereBelongsTo($tournament)
                        ->whereBelongsTo($user)
                        ->get()
-                       ->toJson();
+                       ->toArray();
        }
 
        public function web(Request $request, Tournament $tournament) {
index a07acf12fbcdbd4067c1a74b45115d17a059901d..30b8b62fdef0d4a5004c22141595720b8e6c875d 100644 (file)
@@ -27,7 +27,7 @@ class UserController extends Controller
                        });
                }
                $users = $users->limit(5);
-               return $users->get()->toJson();
+               return $users->get()->toArray();
        }
 
        public function setLanguage(Request $request) {
@@ -43,7 +43,7 @@ class UserController extends Controller
                $user->locale = $validatedData['language'];
                $user->update();
 
-               return $user->toJson();
+               return $user->toArray();
        }
 
        public function setNickname(Request $request, User $user) {
@@ -58,7 +58,7 @@ class UserController extends Controller
 
                UserChanged::dispatch($user);
 
-               return $user->toJson();
+               return $user->toArray();
        }
 
        public function setStreamLink(Request $request, User $user) {
@@ -73,7 +73,7 @@ class UserController extends Controller
 
                UserChanged::dispatch($user);
 
-               return $user->toJson();
+               return $user->toArray();
        }
 
        public function single(Request $request, $id) {
index 98330f8f106985ba92f1cd624860a7edc5b01f93..d60fd630e033d9c99b3151aae0ff79420f87837c 100644 (file)
@@ -187,6 +187,7 @@ class Episode extends Model
 
        protected $hidden = [
                'created_at',
+               'timezone_fix_override',
                'updated_at',
        ];
 
index 6ebaa626fd69e47839756bb9d4dd2bb51433cd08..83caeadec8ed7ae0f1ac607c808cca853b5dc6b3 100644 (file)
@@ -48,6 +48,7 @@ class Event extends Model
 
        protected $hidden = [
                'created_at',
+               'fix_timezone',
                'updated_at',
        ];
 
index cc94327389a5d3476939c9a830398ee6fb5c3166..dc7688166563096c9bc9147b99bc5627d88bff1c 100644 (file)
@@ -51,6 +51,10 @@ class Technique extends Model
                'title_icons' => 'array',
        ];
 
+       protected $hidden = [
+               'halt_sync',
+       ];
+
        protected $with = [
                'translations',
        ];