From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Mon, 8 Dec 2025 12:30:37 +0000 (+0100)
Subject: fix content type of json controllers
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=1eacfcedf4c4729faf36fc0cf5ce447a07eabe9d;p=alttp.git

fix content type of json controllers
---

diff --git a/app/Http/Controllers/AlttpSeedController.php b/app/Http/Controllers/AlttpSeedController.php
index 571a44a..f512fa4 100644
--- a/app/Http/Controllers/AlttpSeedController.php
+++ b/app/Http/Controllers/AlttpSeedController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php
index b0ab063..e7be903 100644
--- a/app/Http/Controllers/ApplicationController.php
+++ b/app/Http/Controllers/ApplicationController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/ChannelController.php b/app/Http/Controllers/ChannelController.php
index 4de8baa..d7bc398 100644
--- a/app/Http/Controllers/ChannelController.php
+++ b/app/Http/Controllers/ChannelController.php
@@ -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) {
diff --git a/app/Http/Controllers/ChatBotLogController.php b/app/Http/Controllers/ChatBotLogController.php
index 041be3c..d9116ec 100644
--- a/app/Http/Controllers/ChatBotLogController.php
+++ b/app/Http/Controllers/ChatBotLogController.php
@@ -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) {
diff --git a/app/Http/Controllers/DiscordBotController.php b/app/Http/Controllers/DiscordBotController.php
index ed1150c..f92977e 100644
--- a/app/Http/Controllers/DiscordBotController.php
+++ b/app/Http/Controllers/DiscordBotController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/DiscordChannelController.php b/app/Http/Controllers/DiscordChannelController.php
index de4ff54..039c5b7 100644
--- a/app/Http/Controllers/DiscordChannelController.php
+++ b/app/Http/Controllers/DiscordChannelController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/DiscordGuildController.php b/app/Http/Controllers/DiscordGuildController.php
index 59c0904..04ffa1e 100644
--- a/app/Http/Controllers/DiscordGuildController.php
+++ b/app/Http/Controllers/DiscordGuildController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/EpisodeController.php b/app/Http/Controllers/EpisodeController.php
index b9bbb5c..c2d9cc8 100644
--- a/app/Http/Controllers/EpisodeController.php
+++ b/app/Http/Controllers/EpisodeController.php
@@ -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) {
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index 14e7467..e630b8b 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -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) {
diff --git a/app/Http/Controllers/ProtocolController.php b/app/Http/Controllers/ProtocolController.php
index 401e623..7978496 100644
--- a/app/Http/Controllers/ProtocolController.php
+++ b/app/Http/Controllers/ProtocolController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/ResultController.php b/app/Http/Controllers/ResultController.php
index d9ab52c..32166ea 100644
--- a/app/Http/Controllers/ResultController.php
+++ b/app/Http/Controllers/ResultController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/RoundController.php b/app/Http/Controllers/RoundController.php
index 1459f52..6814c45 100644
--- a/app/Http/Controllers/RoundController.php
+++ b/app/Http/Controllers/RoundController.php
@@ -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 = [
diff --git a/app/Http/Controllers/StepLadderModeController.php b/app/Http/Controllers/StepLadderModeController.php
index 3f9121d..5e0ee7e 100644
--- a/app/Http/Controllers/StepLadderModeController.php
+++ b/app/Http/Controllers/StepLadderModeController.php
@@ -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();
 	}
 
 }
diff --git a/app/Http/Controllers/TechniqueController.php b/app/Http/Controllers/TechniqueController.php
index 27cc53d..5ae4086 100644
--- a/app/Http/Controllers/TechniqueController.php
+++ b/app/Http/Controllers/TechniqueController.php
@@ -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) {
diff --git a/app/Http/Controllers/TournamentController.php b/app/Http/Controllers/TournamentController.php
index ecba817..9feb053 100644
--- a/app/Http/Controllers/TournamentController.php
+++ b/app/Http/Controllers/TournamentController.php
@@ -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) {
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index a07acf1..30b8b62 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -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) {
diff --git a/app/Models/Episode.php b/app/Models/Episode.php
index 98330f8..d60fd63 100644
--- a/app/Models/Episode.php
+++ b/app/Models/Episode.php
@@ -187,6 +187,7 @@ class Episode extends Model
 
 	protected $hidden = [
 		'created_at',
+		'timezone_fix_override',
 		'updated_at',
 	];
 
diff --git a/app/Models/Event.php b/app/Models/Event.php
index 6ebaa62..83caead 100644
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -48,6 +48,7 @@ class Event extends Model
 
 	protected $hidden = [
 		'created_at',
+		'fix_timezone',
 		'updated_at',
 	];
 
diff --git a/app/Models/Technique.php b/app/Models/Technique.php
index cc94327..dc76881 100644
--- a/app/Models/Technique.php
+++ b/app/Models/Technique.php
@@ -51,6 +51,10 @@ class Technique extends Model
 		'title_icons' => 'array',
 	];
 
+	protected $hidden = [
+		'halt_sync',
+	];
+
 	protected $with = [
 		'translations',
 	];