UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 09:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update StatusController

Browse source
This commit is contained in:
Daniel Supernault 2018-12-01 23:04:42 -07:00
parent 3d7c97b0ed
commit 71393514b2
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/Http/Controllers/StatusController.php
View file

@ -92,6 +92,8 @@ class StatusController extends Controller
$photos = $request->file('photo');
$order = 1;
$mimes = [];
foreach ($photos as $k => $v) {
$storagePath = "public/m/{$monthHash}/{$userHash}";
$path = $v->store($storagePath);
@ -108,10 +110,14 @@ class StatusController extends Controller
$media->filter_name = $request->input('filter_name');
$media->order = $order;
$media->save();
array_push($mimes, $media->mime);
ImageOptimize::dispatch($media);
$order++;
}
$status->type = $this->mimeTypeCheck($mimes);
$status->save();
NewStatusPipeline::dispatch($status);
// TODO: Send to subscribers
@ -254,4 +260,38 @@ class StatusController extends Controller
$allowed = ['public', 'unlisted', 'private'];
return in_array($visibility, $allowed) ? $visibility : 'public';
}
public static function mimeTypeCheck($mimes)
{
$allowed = explode(',', config('pixelfed.media_types'));
$count = count($mimes);
$photos = 0;
$videos = 0;
foreach($mimes as $mime) {
if(in_array($mime, $allowed) == false) {
continue;
}
if(str_contains($mime, 'image/')) {
$photos++;
}
if(str_contains($mime, 'video/')) {
$videos++;
}
}
if($photos == 1 && $videos == 0) {
return 'photo';
}
if($videos == 1 && $photos == 0) {
return 'video';
}
if($photos > 1 && $videos == 0) {
return 'photo:album';
}
if($videos > 1 && $photos == 0) {
return 'video:album';
}
if($photos >= 1 && $videos >= 1) {
return 'photo:video:album';
}
}
}

2
app/Status.php
View file

@ -25,7 +25,7 @@ class Status extends Model
'photo:album',
'video',
'video:album',
'photo:video:album'
'photo:video:album',
'share',
'reply',
'story',