Merge pull request #6284 from pixelfed/shleeable-patch-15

Larastan: Remove unused arg from Function config_cache - Safe/Mergable

app/Http/Controllers/ComposeController.php

@@ -517,7 +517,7 @@ class ComposeController extends Controller
     public function store(Request $request)
     {
         $this->validate($request, [
-            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length'),
             'media.*' => 'required',
             'media.*.id' => 'required|integer|min:1',
             'media.*.filter_class' => 'nullable|alpha_dash|max:30',
@@ -697,7 +697,7 @@ class ComposeController extends Controller
     {
         abort_unless(config('exp.top'), 404);
         $this->validate($request, [
-            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length'),
             'cw' => 'nullable|boolean',
             'visibility' => 'required|string|in:public,private,unlisted|min:2|max:10',
             'place' => 'nullable',
@@ -848,7 +848,7 @@ class ComposeController extends Controller
     public function createPoll(Request $request)
     {
         $this->validate($request, [
-            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length'),
             'cw' => 'nullable|boolean',
             'visibility' => 'required|string|in:public,private',
             'comments_disabled' => 'nullable',

app/Http/Requests/Status/StoreStatusEditRequest.php

@@ -44,7 +44,7 @@ class StoreStatusEditRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'status' => 'sometimes|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'status' => 'sometimes|max:'.config_cache('pixelfed.max_caption_length'),
             'spoiler_text' => 'nullable|string|max:140',
             'sensitive' => 'sometimes|boolean',
             'media_ids' => [

app/Jobs/StoryPipeline/StoryFetch.php

@@ -663,7 +663,7 @@ class StoryFetch implements ShouldQueue
      */
     private function getAllowedMimeTypes(): array
     {
-        $mediaTypes = config_cache('pixelfed.media_types', 'image/jpeg,image/png');
+        $mediaTypes = config_cache('pixelfed.media_types');
 
         return array_map('trim', explode(',', $mediaTypes));
     }

app/Services/LandingService.php

@@ -74,10 +74,10 @@ class LandingService
             'uploader' => [
                 'max_photo_size' => (int) (config_cache('pixelfed.max_photo_size') * 1024),
                 'max_caption_length' => (int) config_cache('pixelfed.max_caption_length'),
-                'max_altext_length' => (int) config_cache('pixelfed.max_altext_length', 150),
+                'max_altext_length' => (int) config_cache('pixelfed.max_altext_length'),
                 'album_limit' => (int) config_cache('pixelfed.max_album_length'),
                 'image_quality' => (int) config_cache('pixelfed.image_quality'),
-                'max_collection_length' => (int) config('pixelfed.max_collection_length', 18),
+                'max_collection_length' => (int) config('pixelfed.max_collection_length'),
                 'optimize_image' => (bool) config_cache('pixelfed.optimize_image'),
                 'optimize_video' => (bool) config_cache('pixelfed.optimize_video'),
                 'media_types' => config_cache('pixelfed.media_types'),