Skip to content

A self-hosted media server and file management system

fix: metadata requests are tightly coupled

aminnausin1c97ef7409ca
diff --git a/app/Http/Requests/MetadataStoreRequest.php b/app/Http/Requests/MetadataStoreRequest.php
index 65098e04..4cc9e3db 100644
--- a/app/Http/Requests/MetadataStoreRequest.php
+++ b/app/Http/Requests/MetadataStoreRequest.php
@@ -2,6 +2,7 @@
namespace App\Http\Requests;
+use App\Support\MetadataRules;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
@@ -28,11 +29,9 @@ class MetadataStoreRequest extends FormRequest {
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array {
- $storeRequestRules = (new MetadataUpdateRequest)->rules();
-
return [
'video_id' => 'required|integer|exists:videos,id',
- ...$storeRequestRules,
+ ...MetadataRules::base(),
];
}
}
diff --git a/app/Http/Requests/MetadataUpdateRequest.php b/app/Http/Requests/MetadataUpdateRequest.php
index 95ee70f3..83f4026c 100644
--- a/app/Http/Requests/MetadataUpdateRequest.php
+++ b/app/Http/Requests/MetadataUpdateRequest.php
@@ -2,7 +2,7 @@
namespace App\Http\Requests;
-use App\Support\RequestPresets;
+use App\Support\MetadataRules;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
@@ -19,8 +19,14 @@ class MetadataUpdateRequest extends FormRequest {
*/
protected function prepareForValidation() {
if ($this->has('poster_url')) {
- $this->merge(['poster_url' => str_replace(' ', '%20', $this->input('poster_url'))]);
+ $this->merge(['poster_url' => str_replace(' ', '%20', $this->input('poster_url'))]); // TODO: supposedly invalid
}
+
+ /**
+ * Supposed Fix: if ($this->filled('poster_url')) { $this->merge([ 'poster_url' => filter_var($this->poster_url, FILTER_SANITIZE_URL), ]); }
+ *
+ * (Issue has not come up yet so complete this later)
+ */
}
/**
@@ -29,22 +35,6 @@ class MetadataUpdateRequest extends FormRequest {
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array {
- return [
- 'title' => 'required|max:255',
- 'description' => 'nullable',
- 'lyrics' => 'nullable',
- 'artist' => 'nullable|max:255',
- 'album' => 'nullable|max:255',
- 'episode' => RequestPresets::NON_NEGATIVE_INT,
- 'season' => RequestPresets::NON_NEGATIVE_INT,
- 'poster_url' => 'nullable|url',
- 'released_at' => 'nullable|date|date_format:Y-m-d',
- 'tags' => 'nullable|max:128',
- 'video_tags' => 'nullable|array',
- 'video_tags.*.name' => 'required|min:1|max:64',
- 'video_tags.*.id' => 'required|integer',
- 'deleted_tags' => 'nullable|array',
- 'deleted_tags.*' => 'integer',
- ];
+ return MetadataRules::base();
}
}
diff --git a/app/Support/MetadataRules.php b/app/Support/MetadataRules.php
new file mode 100644
index 00000000..ab527920
--- /dev/null
+++ b/app/Support/MetadataRules.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Support;
+
+class MetadataRules {
+ public static function base(): array {
+ return [
+ 'title' => 'required|max:255',
+ 'description' => 'nullable',
+ 'lyrics' => 'nullable',
+ 'artist' => 'nullable|max:255',
+ 'album' => 'nullable|max:255',
+ 'episode' => RequestPresets::NON_NEGATIVE_INT,
+ 'season' => RequestPresets::NON_NEGATIVE_INT,
+ 'poster_url' => 'nullable|url',
+ 'released_at' => 'nullable|date|date_format:Y-m-d',
+ 'tags' => 'nullable|max:128',
+ 'video_tags' => 'nullable|array',
+ 'video_tags.*.name' => 'required|min:1|max:64',
+ 'video_tags.*.id' => 'required|integer',
+ 'deleted_tags' => 'nullable|array',
+ 'deleted_tags.*' => 'integer',
+ ];
+ }
+}