diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index bae0c4bc1..fb6b770ba 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1033,7 +1033,7 @@ class ApiV1Controller extends Controller 'file.*' => function() { return [ 'required', - 'mimes:' . config('pixelfed.media_types'), + 'mimes:' . config_cache('pixelfed.media_types'), 'max:' . config_cache('pixelfed.max_photo_size'), ]; }, @@ -1074,7 +1074,7 @@ class ApiV1Controller extends Controller $photo = $request->file('file'); - $mimes = explode(',', config('pixelfed.media_types')); + $mimes = explode(',', config_cache('pixelfed.media_types')); if(in_array($photo->getMimeType(), $mimes) == false) { abort(403, 'Invalid or unsupported mime type.'); } diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php index 592d68fa1..1b9b5d3fe 100644 --- a/app/Http/Controllers/ComposeController.php +++ b/app/Http/Controllers/ComposeController.php @@ -71,7 +71,7 @@ class ComposeController extends Controller 'file.*' => function() { return [ 'required', - 'mimes:' . config('pixelfed.media_types'), + 'mimes:' . config_cache('pixelfed.media_types'), 'max:' . config_cache('pixelfed.max_photo_size'), ]; }, @@ -107,7 +107,7 @@ class ComposeController extends Controller $photo = $request->file('file'); - $mimes = explode(',', config('pixelfed.media_types')); + $mimes = explode(',', config_cache('pixelfed.media_types')); abort_if(in_array($photo->getMimeType(), $mimes) == false, 400, 'Invalid media format'); @@ -164,7 +164,7 @@ class ComposeController extends Controller 'file' => function() { return [ 'required', - 'mimes:' . config('pixelfed.media_types'), + 'mimes:' . config_cache('pixelfed.media_types'), 'max:' . config_cache('pixelfed.max_photo_size'), ]; }, diff --git a/app/Http/Controllers/DirectMessageController.php b/app/Http/Controllers/DirectMessageController.php index 55f2e1094..46f7673ef 100644 --- a/app/Http/Controllers/DirectMessageController.php +++ b/app/Http/Controllers/DirectMessageController.php @@ -500,7 +500,7 @@ class DirectMessageController extends Controller 'file' => function() { return [ 'required', - 'mimes:' . config('pixelfed.media_types'), + 'mimes:' . config_cache('pixelfed.media_types'), 'max:' . config_cache('pixelfed.max_photo_size'), ]; }, @@ -533,7 +533,7 @@ class DirectMessageController extends Controller } $photo = $request->file('file'); - $mimes = explode(',', config('pixelfed.media_types')); + $mimes = explode(',', config_cache('pixelfed.media_types')); if(in_array($photo->getMimeType(), $mimes) == false) { abort(403, 'Invalid or unsupported mime type.'); } diff --git a/app/Http/Controllers/StoryController.php b/app/Http/Controllers/StoryController.php index 76e5d599b..d93711819 100644 --- a/app/Http/Controllers/StoryController.php +++ b/app/Http/Controllers/StoryController.php @@ -78,7 +78,7 @@ class StoryController extends Controller protected function storePhoto($photo, $user) { - $mimes = explode(',', config('pixelfed.media_types')); + $mimes = explode(',', config_cache('pixelfed.media_types')); if(in_array($photo->getMimeType(), [ 'image/jpeg', 'image/png', diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 512ca4268..c5c176fc3 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -63,7 +63,7 @@ class Helpers { $activity = $data['object']; - $mimeTypes = explode(',', config('pixelfed.media_types')); + $mimeTypes = explode(',', config_cache('pixelfed.media_types')); $mediaTypes = in_array('video/mp4', $mimeTypes) ? ['Document', 'Image', 'Video'] : ['Document', 'Image']; if(!isset($activity['attachment']) || empty($activity['attachment'])) { @@ -418,7 +418,7 @@ class Helpers { $attachments = isset($data['object']) ? $data['object']['attachment'] : $data['attachment']; $user = $status->profile; $storagePath = MediaPathService::get($user, 2); - $allowed = explode(',', config('pixelfed.media_types')); + $allowed = explode(',', config_cache('pixelfed.media_types')); foreach($attachments as $media) { $type = $media['mediaType']; diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 79acff98c..524edc21f 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -251,7 +251,7 @@ class Inbox if(count($activity['attachment'])) { $photos = 0; $videos = 0; - $allowed = explode(',', config('pixelfed.media_types')); + $allowed = explode(',', config_cache('pixelfed.media_types')); $activity['attachment'] = array_slice($activity['attachment'], 0, config_cache('pixelfed.max_album_length')); foreach($activity['attachment'] as $a) { $type = $a['mediaType']; diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php index 870aed9f8..552af0ef3 100644 --- a/app/Util/Site/Config.php +++ b/app/Util/Site/Config.php @@ -22,7 +22,7 @@ class Config { 'optimize_image' => config('pixelfed.optimize_image'), 'optimize_video' => config('pixelfed.optimize_video'), - 'media_types' => config('pixelfed.media_types'), + 'media_types' => config_cache('pixelfed.media_types'), 'enforce_account_limit' => config('pixelfed.enforce_account_limit') ], @@ -57,7 +57,7 @@ class Config { 'mobile_apis' => config('pixelfed.oauth_enabled'), 'circles' => false, 'stories' => config('instance.stories.enabled'), - 'video' => Str::contains(config('pixelfed.media_types'), 'video/mp4'), + 'video' => Str::contains(config_cache('pixelfed.media_types'), 'video/mp4'), 'import' => [ 'instagram' => config('pixelfed.import.instagram.enabled'), 'mastodon' => false,