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

Deprecate mixed media albums

Browse source
This commit is contained in:
Daniel Supernault 2019-12-14 21:29:00 -07:00
parent aa1f74efbc
commit 1b20ebd46d
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/InternalApiController.php
View file

@ -290,6 +290,12 @@ class InternalApiController extends Controller
array_push($mimes, $m->mime);
}
$mediaType = StatusController::mimeTypeCheck($mimes);
if(in_array($mediaType, ['photo', 'video', 'photo:album']) == false) {
abort(400, __('exception.compose.invalid.album'));
}
if($place && is_array($place)) {
$status->place_id = $place['id'];
}
@ -317,7 +323,7 @@ class InternalApiController extends Controller
$status->is_nsfw = $cw;
$status->visibility = $visibility;
$status->scope = $visibility;
$status->type = StatusController::mimeTypeCheck($mimes);
$status->type = $mediaType;
$status->save();
NewStatusPipeline::dispatch($status);