UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-23 21:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update BaseApiController

Browse source
This commit is contained in:
Daniel Supernault 2018-10-20 22:27:27 -06:00
parent 9282900591
commit 3e09250328
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ use App\Transformer\Api\StatusTransformer;
use Auth; use Auth;
use Cache; use Cache;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\URL;
use League\Fractal; use League\Fractal;
use League\Fractal\Serializer\ArraySerializer; use League\Fractal\Serializer\ArraySerializer;
@ -119,6 +120,20 @@ class BaseApiController extends Controller
]); ]);
} }
public function showTempMedia(Request $request, $profileId, $mediaId)
{
if (!$request->hasValidSignature()) {
abort(401);
}
$profile = Auth::user()->profile;
if($profile->id !== (int) $profileId) {
abort(403);
}
$media = Media::whereProfileId($profile->id)->findOrFail($mediaId);
$path = storage_path('app/'.$media->media_path);
return response()->file($path);
}
public function uploadMedia(Request $request) public function uploadMedia(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
@ -130,10 +145,27 @@ class BaseApiController extends Controller
]; ];
}, },
]); ]);
$user = Auth::user(); $user = Auth::user();
$profile = $user->profile; $profile = $user->profile;
if(config('pixelfed.enforce_account_limit') == true) {
$size = Media::whereUserId($user->id)->sum('size') / 1000;
$limit = (int) config('pixelfed.max_account_size');
if ($size >= $limit) {
abort(403, 'Account size limit reached.');
}
}
$recent = Media::whereProfileId($profile->id)->whereNull('status_id')->count();
if($recent > 50) {
abort(403);
}
$monthHash = hash('sha1', date('Y').date('m')); $monthHash = hash('sha1', date('Y').date('m'));
$userHash = hash('sha1', $user->id.(string) $user->created_at); $userHash = hash('sha1', $user->id.(string) $user->created_at);
$photo = $request->file('file'); $photo = $request->file('file');
$storagePath = "public/m/{$monthHash}/{$userHash}"; $storagePath = "public/m/{$monthHash}/{$userHash}";
@ -152,9 +184,21 @@ class BaseApiController extends Controller
$media->filter_name = null; $media->filter_name = null;
$media->save(); $media->save();
$url = URL::temporarySignedRoute(
'temp-media', now()->addHours(1), ['profileId' => $profile->id, 'mediaId' => $media->id]
);
ImageOptimize::dispatch($media); ImageOptimize::dispatch($media);
$resource = new Fractal\Resource\Item($media, new MediaTransformer());
$res = $this->fractal->createData($resource)->toArray(); $res = [
'id' => $media->id,
'type' => $media->activityVerb(),
'url' => $url,
'remote_url' => null,
'preview_url' => $url,
'text_url' => null,
'meta' => $media->metadata,
'description' => null,
];
return response()->json($res); return response()->json($res);
} }