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

Merge 4444e41c53 into 37a82cfb90

This commit is contained in:
Margarita Bliznikova 2024-03-08 07:07:10 -07:00 committed by GitHub
parent 37a82cfb90 4444e41c53
commit 214014ce25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ComposeController.php
View File

@ -560,7 +560,7 @@ class ComposeController extends Controller
$mediaType = StatusController::mimeTypeCheck($mimes);
if(in_array($mediaType, ['photo', 'video', 'photo:album']) == false) {
if(in_array($mediaType, ['photo', 'video', 'photo:album', 'video:album', 'photo:video:album']) == false) {
abort(400, __('exception.compose.invalid.album'));
}

2
app/Http/Controllers/PublicApiController.php
View File

@ -693,7 +693,7 @@ class PublicApiController extends Controller
$limit = $request->limit ?? 9;
$max_id = $request->max_id;
$min_id = $request->min_id;
$scope = ['photo', 'photo:album', 'video', 'video:album'];
$scope = ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];
$onlyMedia = $request->input('only_media', true);
if(!$min_id && !$max_id) {