A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: code smells and tiny optimisations
aminnausin2025c972c394
diff --git a/app/Http/Controllers/Api/V1/AnalyticsController.php b/app/Http/Controllers/Api/V1/AnalyticsController.phpindex 23ebc2b5..39eebf5a 100644--- a/app/Http/Controllers/Api/V1/AnalyticsController.php+++ b/app/Http/Controllers/Api/V1/AnalyticsController.php@@ -24,7 +24,7 @@ class AnalyticsController extends Controller {$startDate = today()->sub($interval);try {- if (! Auth::user()->id == 1) {+ if (Auth::id() !== 1) {return $this->forbidden();}diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.phpindex 40fa8eb6..46dc8d09 100755--- a/app/Http/Controllers/Api/V1/CategoryController.php+++ b/app/Http/Controllers/Api/V1/CategoryController.php@@ -60,8 +60,8 @@ class CategoryController extends Controller {* @param int $category_id*/public function update(CategoryUpdateRequest $request, Category $category) {- if (! Auth::user() || Auth::user()->id !== 1) {- $this->unauthorised();+ if (Auth::id() !== 1) {+ return $this->forbidden();}try {@@ -88,7 +88,7 @@ class CategoryController extends Controller {*/public function updatePrivacy(CategoryPrivacyUpdateRequest $request, Category $category) {if (Auth::id() !== 1) {- $this->unauthorised();+ return $this->forbidden();}try {diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.phpindex e11a40e0..0bf6a7d6 100755--- a/app/Http/Controllers/Api/V1/FolderController.php+++ b/app/Http/Controllers/Api/V1/FolderController.php@@ -22,7 +22,7 @@ class FolderController extends Controller {$category = Category::find($validated['category_id']);- if (! $category || ($category->is_private && (! $request->user('sanctum') || (Auth::user() && Auth::user()->id !== 1)))) {+ if (! $category || ($category->is_private && Auth::id() !== 1)) {return $this->error(null, 'Access to this folder is forbidden', 403);}diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.phpindex 4ff492c9..cdb96b5d 100644--- a/app/Http/Controllers/Api/V1/RecordController.php+++ b/app/Http/Controllers/Api/V1/RecordController.php@@ -33,15 +33,7 @@ class RecordController extends Controller {}public function userViewCount(Metadata $metadata) {- if (! Auth::user()) {- $this->unauthorised();- }-- try {- return Record::where('user_id', Auth::user()->id)->where('metadata_id', $metadata->id)->count();- } catch (\Throwable $th) {- return $this->error(null, 'Unable to user view count. Error: ' . $th->getMessage(), 500);- }+ return Record::where('user_id', Auth::id())->where('metadata_id', $metadata->id)->count();}/**diff --git a/app/Http/Controllers/Api/V1/SubTaskController.php b/app/Http/Controllers/Api/V1/SubTaskController.phpindex 1bb3c7ea..e5c25566 100644--- a/app/Http/Controllers/Api/V1/SubTaskController.php+++ b/app/Http/Controllers/Api/V1/SubTaskController.php@@ -38,8 +38,8 @@ class SubTaskController extends Controller {* Display the specified resource.*/public function show(Request $request, Task $task) {- if (! Auth::user() || Auth::user()->id !== 1) {- $this->unauthorised();+ if (Auth::id() !== 1) {+ return $this->forbidden();}try {diff --git a/app/Http/Controllers/Api/V1/TaskController.php b/app/Http/Controllers/Api/V1/TaskController.phpindex 76a5ed08..825aef90 100644--- a/app/Http/Controllers/Api/V1/TaskController.php+++ b/app/Http/Controllers/Api/V1/TaskController.php@@ -20,37 +20,25 @@ class TaskController extends Controller {* Display a listing of the resource.*/public function index() {- if (! Auth::user() || Auth::user()->id !== 1) {- abort(403, 'Not allowed access to tasks.');+ if (Auth::id() !== 1) {+ return $this->forbidden('Not allowed access to tasks.');}- try {- return- TasksResource::collection(- Task::all()->sortByDesc('created_at')- );- } catch (\Throwable $th) {- return $this->error(null, 'Unable to get list of tasks. Error: ' . $th->getMessage(), 500);- }+ return TasksResource::collection(+ Task::all()->sortByDesc('created_at')+ );}public function stats(Request $request) {- // $this->period = $request->query('period', '1_hour');- // $interval = $this->periodAsInterval();- // $startDate = today()->sub($interval);-try {- if (! Auth::user()->id == 1) {- return Response('Forbidden', 403);- }+ $failValue = TaskStatus::FAILED->value;+ $cancelValue = TaskStatus::CANCELLED->value;$results = DB::table('sub_tasks')- ->select(- DB::raw('AVG(duration) as avg_duration'),- // DB::raw('SUM(CASE WHEN status = "failed" THEN 1 ELSE 0 END) / COUNT(*) * 100 as avg_fail_rate'),- // DB::raw('SUM(CASE WHEN status = "cancelled" THEN 1 ELSE 0 END) as count_cancelled'),- DB::raw('COUNT(*) as count_subtasks')- )+ ->selectRaw('AVG(duration) as avg_duration')+ ->selectRaw('COUNT(*) as count_subtasks')+ ->selectRaw('SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) * 100.0 / NULLIF(COUNT(*), 0) as avg_fail_rate', [$failValue])+ ->selectRaw('SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) as count_cancelled', [$cancelValue])->first();$taskCounts = Task::select(@@ -60,8 +48,8 @@ class TaskController extends Controller {$currentCounts = ['avg_duration' => $results->avg_duration,- 'avg_fail_rate' => 0,- 'count_cancelled' => 0,+ 'avg_fail_rate' => $results->avg_fail_rate,+ 'count_cancelled' => $results->count_cancelled,'avg_count_sub_tasks' => $taskCounts->avg_count_sub_tasks,'count_tasks' => $taskCounts->count_tasks,'count_running' => Task::where('status', TaskStatus::PROCESSING)->count(),@@ -81,31 +69,41 @@ class TaskController extends Controller {* @return \Illuminate\Http\Response*/public function destroy(Task $task) {- return $this->isNotAuthorised() ?? $task->delete() ? $this->success('', 'Success', 200) : $this->error('', 'Not found', 404);+ if ($res = $this->isNotAuthorised()) {+ return $res;+ }++ if ($task->delete()) {+ return response();+ }++ return response()->json(['message' => 'Task not found.'], 404);}public function cancel(Task $task, TaskService $taskService) {- if ($task->batch_id) {- $batch = Bus::findBatch($task->batch_id);- if ($batch) {- $batch->cancel();- $taskService->updateTask($task->id, ['status' => TaskStatus::CANCELLED]);-- return response()->json(['message' => 'Batch canceled successfully.']);- } else {- $taskService->updateTask($task->id, ['status' => TaskStatus::INCOMPLETE]);-- return response()->json(['message' => 'Batch not found.'], 404);- }+ $batch = $task->batch_id ? Bus::findBatch($task->batch_id) : null;++ if (! $batch) {+ $taskService->updateTask($task->id, ['status' => TaskStatus::INCOMPLETE]);++ $message = $task->batch_id+ ? 'Batch not found.'+ : 'No batch ID associated with this task.';++ $status = $task->batch_id ? 404 : 422;++ return response()->json(['message' => $message], $status);}- $taskService->updateTask($task->id, ['status' => TaskStatus::INCOMPLETE]);- return response()->json(['message' => 'No batch ID associated with this task.'], 400);+ $batch->cancel();+ $taskService->updateTask($task->id, ['status' => TaskStatus::CANCELLED]);++ return response()->json(['message' => 'Batch canceled successfully.']);}private function isNotAuthorised() {if (Auth::id() != 1) {- return $this->error('', 'Unauthorised request.', 403);+ return response()->json(['message' => 'Unauthorised request.'], 403);}return null;diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex b0af481f..b47f6b66 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -80,7 +80,7 @@ class DirectoryController extends Controller {}private function validateCategoryAccess(Category $category): void {- if ($category->is_private && (! auth('sanctum')->check() || (Auth::user() && Auth::user()->id !== 1))) {+ if ($category->is_private && Auth::id() !== 1) {throw new ForbiddenException('Access to this folder is forbidden');}}@@ -102,4 +102,5 @@ class DirectoryController extends Controller {}}-class ForbiddenException extends Exception {}+class ForbiddenException extends Exception {+}diff --git a/app/Http/Middleware/UserLastActive.php b/app/Http/Middleware/UserLastActive.phpindex 868302f5..8b84cf46 100644--- a/app/Http/Middleware/UserLastActive.php+++ b/app/Http/Middleware/UserLastActive.php@@ -14,7 +14,7 @@ class UserLastActive {*/public function handle($request, Closure $next) {if (Auth::check()) {- User::where('id', Auth::user()->id)->update(['last_active' => now()]);+ request()->user()->update(['last_active' => now()]);}return $next($request);diff --git a/app/Http/Requests/CategoryPrivacyUpdateRequest.php b/app/Http/Requests/CategoryPrivacyUpdateRequest.phpindex 80a33df3..28aa1a2d 100644--- a/app/Http/Requests/CategoryPrivacyUpdateRequest.php+++ b/app/Http/Requests/CategoryPrivacyUpdateRequest.php@@ -10,7 +10,7 @@ class CategoryPrivacyUpdateRequest extends FormRequest {* Determine if the user is authorized to make this request.*/public function authorize(): bool {- return Auth::check() && Auth::user()->id === 1;+ return Auth::id() === 1;}/**diff --git a/app/Http/Requests/CategoryUpdateRequest.php b/app/Http/Requests/CategoryUpdateRequest.phpindex a06e127b..19cdf443 100644--- a/app/Http/Requests/CategoryUpdateRequest.php+++ b/app/Http/Requests/CategoryUpdateRequest.php@@ -10,7 +10,7 @@ class CategoryUpdateRequest extends FormRequest {* Determine if the user is authorized to make this request.*/public function authorize(): bool {- return Auth::check() && Auth::user()->id === 1;+ return Auth::id() === 1;;}/**diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.phpindex e796c5a3..fa19ee4d 100644--- a/app/Http/Resources/MetadataResource.php+++ b/app/Http/Resources/MetadataResource.php@@ -29,21 +29,8 @@ class MetadataResource extends JsonResource {'relationships' => ['video_id' => $this->video_id,'editor_id' => $this->editor_id,- // 'playback_data' => PlaybackResource::collection($this->playbacks),'video_tags' => VideoTagResource::collection($this->videoTags),],];}}--// protected static $editorCache = [];--// $editorId = $this->editor_id; // Assuming editor_id is the foreign key-// $editor = null;--// if (isset(self::$editorCache[$editorId])) {-// $editor = self::$editorCache[$editorId];-// } else {-// $editor = $this->editor;-// self::$editorCache[$editorId] = $editor;-// }diff --git a/app/Http/Resources/Pulse/DashboardResource.php b/app/Http/Resources/Pulse/DashboardResource.phpindex 44646b97..16796af5 100644--- a/app/Http/Resources/Pulse/DashboardResource.php+++ b/app/Http/Resources/Pulse/DashboardResource.php@@ -8,7 +8,7 @@ class DashboardResource extends PulseResource {public function toArray(Request $request): array {$resources = config('pulse-api.resources');- $result = $resources->mapWithKeys(function (string $resource, string $key) use ($request) {+ $result = $resources->mapWithKeys(function (string $resource) use ($request) {return (new $resource(null, $this->period))->toArray($request);});diff --git a/app/Traits/HttpResponses.php b/app/Traits/HttpResponses.phpindex 34453e00..9832b7ba 100755--- a/app/Traits/HttpResponses.php+++ b/app/Traits/HttpResponses.php@@ -21,7 +21,7 @@ trait HttpResponses {abort(401, 'Unauthorised action.');}- protected function forbidden() {- return Response('Forbidden', 403);+ protected function forbidden($message = 'Forbidden') {+ return Response($message, 403);}}