yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update config() to config_cache()

Browse source
This commit is contained in:
Daniel Supernault 2021-05-10 20:04:13 -06:00
parent e7b33c4cc6
commit 1d54204635
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -960,7 +960,7 @@ class ApiV1Controller extends Controller
$res = [ $res = [
'approval_required' => false, 'approval_required' => false,
'contact_account' => null, 'contact_account' => null,
'description' => config('instance.description'), 'description' => config_cache('app.description'),
'email' => config('instance.email'), 'email' => config('instance.email'),
'invites_enabled' => false, 'invites_enabled' => false,
'rules' => [], 'rules' => [],
@ -979,7 +979,7 @@ class ApiV1Controller extends Controller
'urls' => [], 'urls' => [],
'version' => '2.7.2 (compatible; Pixelfed ' . config('pixelfed.version') . ')', 'version' => '2.7.2 (compatible; Pixelfed ' . config('pixelfed.version') . ')',
'environment' => [ 'environment' => [
'max_photo_size' => (int) config('pixelfed.max_photo_size'), 'max_photo_size' => (int) config_cache('pixelfed.max_photo_size'),
'max_avatar_size' => (int) config('pixelfed.max_avatar_size'), 'max_avatar_size' => (int) config('pixelfed.max_avatar_size'),
'max_caption_length' => (int) config('pixelfed.max_caption_length'), 'max_caption_length' => (int) config('pixelfed.max_caption_length'),
'max_bio_length' => (int) config('pixelfed.max_bio_length'), 'max_bio_length' => (int) config('pixelfed.max_bio_length'),
@ -1034,7 +1034,7 @@ class ApiV1Controller extends Controller
return [ return [
'required', 'required',
'mimes:' . config('pixelfed.media_types'), 'mimes:' . config('pixelfed.media_types'),
'max:' . config('pixelfed.max_photo_size'), 'max:' . config_cache('pixelfed.max_photo_size'),
]; ];
}, },
'filter_name' => 'nullable|string|max:24', 'filter_name' => 'nullable|string|max:24',

2
app/Http/Controllers/DirectMessageController.php
View file

@ -501,7 +501,7 @@ class DirectMessageController extends Controller
return [ return [
'required', 'required',
'mimes:' . config('pixelfed.media_types'), 'mimes:' . config('pixelfed.media_types'),
'max:' . config('pixelfed.max_photo_size'), 'max:' . config_cache('pixelfed.max_photo_size'),
]; ];
}, },
'to_id' => 'required' 'to_id' => 'required'

2
app/Http/Controllers/StoryController.php
View file

@ -28,7 +28,7 @@ class StoryController extends Controller
return [ return [
'required', 'required',
'mimes:image/jpeg,image/png,video/mp4', 'mimes:image/jpeg,image/png,video/mp4',
'max:' . config('pixelfed.max_photo_size'), 'max:' . config_cache('pixelfed.max_photo_size'),
]; ];
}, },
]); ]);

4
app/Services/MediaStorageService.php
View file

@ -47,7 +47,7 @@ class MediaStorageService {
empty($h['Content-Length']) || empty($h['Content-Length']) ||
empty($h['Content-Type']) || empty($h['Content-Type']) ||
$h['Content-Length'] < 10 || $h['Content-Length'] < 10 ||
$h['Content-Length'] > (config('pixelfed.max_photo_size') * 1000) $h['Content-Length'] > (config_cache('pixelfed.max_photo_size') * 1000)
) { ) {
return false; return false;
} }
@ -114,7 +114,7 @@ class MediaStorageService {
]; ];
$mime = $head['mime']; $mime = $head['mime'];
$max_size = (int) config('pixelfed.max_photo_size') * 1000; $max_size = (int) config_cache('pixelfed.max_photo_size') * 1000;
$media->size = $head['length']; $media->size = $head['length'];
$media->remote_media = true; $media->remote_media = true;
$media->save(); $media->save();