YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Merge pull request #3211 from pixelfed/staging

Browse source 
Update compiled assets
This commit is contained in:
daniel 2022-02-05 19:32:30 -07:00 • committed by GitHub
commit fb29af0b44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -452,7 +452,7 @@ class AdminController extends Controller
->whereShortcode($request->input('shortcode')); ->whereShortcode($request->input('shortcode'));
}) })
], ],
'emoji' => 'required|file|mimes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000) 'emoji' => 'required|file|mimetypes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000)
]); ]);
$emoji = new CustomEmoji; $emoji = new CustomEmoji;

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

@ -1280,7 +1280,7 @@ class ApiV1Controller extends Controller
'file.*' => function() { 'file.*' => function() {
return [ return [
'required', 'required',
'mimes:' . config_cache('pixelfed.media_types'), 'mimetypes:' . config_cache('pixelfed.media_types'),
'max:' . config_cache('pixelfed.max_photo_size'), 'max:' . config_cache('pixelfed.max_photo_size'),
]; ];
}, },

2
app/Http/Controllers/Api/BaseApiController.php
View file

@ -183,7 +183,7 @@ class BaseApiController extends Controller
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'upload' => 'required|mimes:jpeg,png,gif|max:'.config('pixelfed.max_avatar_size'), 'upload' => 'required|mimetypes:jpeg,png,gif|max:'.config('pixelfed.max_avatar_size'),
]); ]);
try { try {

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

@ -19,7 +19,7 @@ class AvatarController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'avatar' => 'required|mimes:jpeg,png|max:'.config('pixelfed.max_avatar_size'), 'avatar' => 'required|mimetypes:jpeg,png|max:'.config('pixelfed.max_avatar_size'),
]); ]);
try { try {

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

@ -499,7 +499,7 @@ class DirectMessageController extends Controller
'file' => function() { 'file' => function() {
return [ return [
'required', 'required',
'mimes:' . config_cache('pixelfed.media_types'), 'mimetypes:' . config_cache('pixelfed.media_types'),
'max:' . config_cache('pixelfed.max_photo_size'), 'max:' . config_cache('pixelfed.max_photo_size'),
]; ];
}, },

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

@ -39,7 +39,7 @@ class StoryComposeController extends Controller
'file' => function() { 'file' => function() {
return [ return [
'required', 'required',
'mimes:image/jpeg,image/png,video/mp4', 'mimetypes:image/jpeg,image/png,video/mp4',
'max:' . config_cache('pixelfed.max_photo_size'), 'max:' . config_cache('pixelfed.max_photo_size'),
]; ];
}, },

2
public/js/spa.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -24,7 +24,7 @@
"/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7", "/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7",
"/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5", "/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5",
"/js/search.js": "/js/search.js?id=dc888b173463dc3894ba", "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
"/js/spa.js": "/js/spa.js?id=a29c72fa479456730f3e", "/js/spa.js": "/js/spa.js?id=6adc5483da616d79a324",
"/js/status.js": "/js/status.js?id=40d0d3dd9884242ce66b", "/js/status.js": "/js/status.js?id=40d0d3dd9884242ce66b",
"/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7", "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
"/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a", "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",