From bae6126db342cbadf6b767ff50e6a1e8b0ec85f9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 5 Feb 2022 19:32:10 -0700 Subject: [PATCH] Update compiled assets --- app/Http/Controllers/AdminController.php | 2 +- app/Http/Controllers/Api/ApiV1Controller.php | 2 +- .../Controllers/Api/BaseApiController.php | 2 +- app/Http/Controllers/AvatarController.php | 2 +- .../Controllers/DirectMessageController.php | 2 +- .../Controllers/StoryComposeController.php | 2 +- public/js/spa.js | Bin 1544695 -> 1544706 bytes public/mix-manifest.json | Bin 1983 -> 1983 bytes 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index b54f26844..d83088737 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -452,7 +452,7 @@ class AdminController extends Controller ->whereShortcode($request->input('shortcode')); }) ], - 'emoji' => 'required|file|mimes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000) + 'emoji' => 'required|file|mimetypes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000) ]); $emoji = new CustomEmoji; diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index b43de1fc7..70ae2f408 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1280,7 +1280,7 @@ class ApiV1Controller extends Controller 'file.*' => function() { return [ 'required', - 'mimes:' . config_cache('pixelfed.media_types'), + 'mimetypes:' . config_cache('pixelfed.media_types'), 'max:' . config_cache('pixelfed.max_photo_size'), ]; }, diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index c029b0feb..dd455fda5 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -183,7 +183,7 @@ class BaseApiController extends Controller { abort_if(!$request->user(), 403); $this->validate($request, [ - 'upload' => 'required|mimes:jpeg,png,gif|max:'.config('pixelfed.max_avatar_size'), + 'upload' => 'required|mimetypes:jpeg,png,gif|max:'.config('pixelfed.max_avatar_size'), ]); try { diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php index 672e124f1..bb95c1eda 100644 --- a/app/Http/Controllers/AvatarController.php +++ b/app/Http/Controllers/AvatarController.php @@ -19,7 +19,7 @@ class AvatarController extends Controller public function store(Request $request) { $this->validate($request, [ - 'avatar' => 'required|mimes:jpeg,png|max:'.config('pixelfed.max_avatar_size'), + 'avatar' => 'required|mimetypes:jpeg,png|max:'.config('pixelfed.max_avatar_size'), ]); try { diff --git a/app/Http/Controllers/DirectMessageController.php b/app/Http/Controllers/DirectMessageController.php index 06e013126..d59abc0eb 100644 --- a/app/Http/Controllers/DirectMessageController.php +++ b/app/Http/Controllers/DirectMessageController.php @@ -499,7 +499,7 @@ class DirectMessageController extends Controller 'file' => function() { return [ 'required', - 'mimes:' . config_cache('pixelfed.media_types'), + 'mimetypes:' . config_cache('pixelfed.media_types'), 'max:' . config_cache('pixelfed.max_photo_size'), ]; }, diff --git a/app/Http/Controllers/StoryComposeController.php b/app/Http/Controllers/StoryComposeController.php index 9e2ed17cd..ec2ebfcf3 100644 --- a/app/Http/Controllers/StoryComposeController.php +++ b/app/Http/Controllers/StoryComposeController.php @@ -39,7 +39,7 @@ class StoryComposeController extends Controller 'file' => function() { return [ 'required', - 'mimes:image/jpeg,image/png,video/mp4', + 'mimetypes:image/jpeg,image/png,video/mp4', 'max:' . config_cache('pixelfed.max_photo_size'), ]; }, diff --git a/public/js/spa.js b/public/js/spa.js index 102bf8c9159f52670e4d9e5f3c01d11159c81805..6673e09611a7b28e369b8935b9c9d6a661718106 100644 GIT binary patch delta 97 zcmeyqIId|)Ttf?E3sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3*Q!g$>Qm86Ij@$yBG5d rv1F#$+D@Nf#VFS9P|Od+0zfPX#6mzU48$TpEDFS8+Z~FQk-kC<7fALtYm gY_}@r2Vwyr2C;>JSQv;!fLIiW#kN}&i=U7K03_EPH2?qr diff --git a/public/mix-manifest.json b/public/mix-manifest.json index f0c6163031e31af047b3c3693601f061cb2f59e7..9c7c3da884293e99e32326c51ae4c9e1d7bcec57 100644 GIT binary patch delta 33 ocmdnbzn_1@Y&H?I#FS)H6AR;%L^DIP6m!c&V)8Yt0k^6N-2eap delta 33 ocmdnbzn_1@Y&MZZBg)8Yt0kdKWwEzGB