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 102bf8c91..6673e0961 100644 Binary files a/public/js/spa.js and b/public/js/spa.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index f0c616303..9c7c3da88 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ