UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update BaseApiController, add timestamp to signed media previews for client side cache invalidation

Browse source
This commit is contained in:
Daniel Supernault 2019-10-11 23:24:56 -06:00
parent d8d11d7b9a
commit 73c0898703
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,7 +192,7 @@ class BaseApiController extends Controller
]); ]);
} }
public function showTempMedia(Request $request, int $profileId, $mediaId) public function showTempMedia(Request $request, int $profileId, $mediaId, $timestamp)
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
abort_if(!$request->hasValidSignature(), 404); abort_if(!$request->hasValidSignature(), 404);
@ -257,10 +257,9 @@ class BaseApiController extends Controller
$media->save(); $media->save();
$url = URL::temporarySignedRoute( $url = URL::temporarySignedRoute(
'temp-media', now()->addHours(1), ['profileId' => $profile->id, 'mediaId' => $media->id] 'temp-media', now()->addHours(1), ['profileId' => $profile->id, 'mediaId' => $media->id, 'timestamp' => time()]
); );
$preview_url = $url;
switch ($media->mime) { switch ($media->mime) {
case 'image/jpeg': case 'image/jpeg':
case 'image/png': case 'image/png':
@ -279,7 +278,7 @@ class BaseApiController extends Controller
$resource = new Fractal\Resource\Item($media, new MediaTransformer()); $resource = new Fractal\Resource\Item($media, new MediaTransformer());
$res = $this->fractal->createData($resource)->toArray(); $res = $this->fractal->createData($resource)->toArray();
$res['preview_url'] = $preview_url; $res['preview_url'] = $url;
$res['url'] = $url; $res['url'] = $url;
return response()->json($res); return response()->json($res);
} }