mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #3803 from syntafin/dev 

Fix Emoji Mime Type Validation
This commit is contained in:
daniel 2023-03-04 14:59:33 -07:00 committed by GitHub
parent 87a7a2767c eb6367d34f
commit b51bacf672
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/AdminController.php
View File

@ -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;