1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-25 09:17:03 +00:00

Merge pull request #1853 from pixelfed/staging

Fixes #1852
This commit is contained in:
daniel 2019-11-30 18:36:45 -07:00 committed by GitHub
commit b10295a17b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -193,11 +193,11 @@ class BaseApiController extends Controller
]); ]);
} }
public function showTempMedia(Request $request, int $profileId, $mediaId, $timestamp) public function showTempMedia(Request $request, $profileId, $mediaId, $timestamp)
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
abort_if(!$request->hasValidSignature(), 404); abort_if(!$request->hasValidSignature(), 404);
abort_if(Auth::user()->profile_id !== $profileId, 404); abort_if(Auth::user()->profile_id != $profileId, 404);
$media = Media::whereProfileId(Auth::user()->profile_id)->findOrFail($mediaId); $media = Media::whereProfileId(Auth::user()->profile_id)->findOrFail($mediaId);
$path = storage_path('app/'.$media->media_path); $path = storage_path('app/'.$media->media_path);
return response()->file($path); return response()->file($path);