diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 32b27939d..308290459 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -42,13 +42,13 @@ use App\Models\CustomEmoji; class AdminController extends Controller { - use AdminReportController, + use AdminReportController, AdminDirectoryController, AdminDiscoverController, AdminHashtagsController, // AdminGroupsController, - AdminMediaController, - AdminSettingsController, + AdminMediaController, + AdminSettingsController, AdminInstanceController, // AdminStorageController, AdminUserController; @@ -523,7 +523,7 @@ class AdminController extends Controller ->whereShortcode($request->input('shortcode')); }) ], - 'emoji' => 'required|file|mimetypes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000) + 'emoji' => 'required|file|mimes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000) ]); $emoji = new CustomEmoji;