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

Merge pull request #2739 from pixelfed/staging

Browse source 
Update StoryController
This commit is contained in:
daniel 2021-04-29 23:58:29 -06:00 committed by GitHub
commit c250bdaaf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/Http/Controllers/StoryController.php
View file

@ -13,6 +13,9 @@ use Cache, Storage;
use Image as Intervention; use Image as Intervention;
use App\Services\FollowerService; use App\Services\FollowerService;
use App\Services\MediaPathService; use App\Services\MediaPathService;
use FFMpeg;
use FFMpeg\Coordinate\Dimension;
use FFMpeg\Format\Video\X264;
class StoryController extends Controller class StoryController extends Controller
{ {
@ -49,11 +52,27 @@ class StoryController extends Controller
$story->size = $photo->getSize(); $story->size = $photo->getSize();
$story->save(); $story->save();
$url = $story->path;
if($story->type === 'video') {
$video = FFMpeg::open($path);
$width = $video->getVideoStream()->get('width');
$height = $video->getVideoStream()->get('height');
if($width !== 1080 || $height !== 1920) {
Storage::delete($story->path);
$story->delete();
abort(422, 'Invalid video dimensions, must be 1080x1920');
}
}
return [ return [
'code' => 200, 'code' => 200,
'msg' => 'Successfully added', 'msg' => 'Successfully added',
'media_id' => (string) $story->id, 'media_id' => (string) $story->id,
'media_url' => url(Storage::url($story->path)) 'media_url' => url(Storage::url($url)),
'media_type' => $story->type
]; ];
} }
@ -108,9 +127,11 @@ class StoryController extends Controller
abort(400, 'Invalid or missing media.'); abort(400, 'Invalid or missing media.');
} }
$img = Intervention::make($path); if($story->type === 'photo') {
$img->crop($width, $height, $x, $y); $img = Intervention::make($path);
$img->save($path, config('pixelfed.image_quality')); $img->crop($width, $height, $x, $y);
$img->save($path, config('pixelfed.image_quality'));
}
return [ return [
'code' => 200, 'code' => 200,
@ -237,6 +258,7 @@ class StoryController extends Controller
'linkText' => null, 'linkText' => null,
'time' => $s->created_at->format('U'), 'time' => $s->created_at->format('U'),
'expires_at' => (int) $s->expires_at->format('U'), 'expires_at' => (int) $s->expires_at->format('U'),
'created_ago' => $s->created_at->diffForHumans(null, true, true),
'seen' => $s->seen() 'seen' => $s->seen()
]; ];
})->toArray(); })->toArray();