yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update Api controllers, use MediaPathService

Browse source
This commit is contained in:
Daniel Supernault 2020-07-12 21:27:34 -06:00
parent c54b29c559
commit 588642123e
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ use App\Jobs\VideoPipeline\{
VideoThumbnail
};
use App\Services\NotificationService;
use App\Services\MediaPathService;
class BaseApiController extends Controller
{
@ -235,9 +236,6 @@ class BaseApiController extends Controller
$filterClass = in_array($request->input('filter_class'), Filter::classes()) ? $request->input('filter_class') : null;
$filterName = in_array($request->input('filter_name'), Filter::names()) ? $request->input('filter_name') : null;
$monthHash = hash('sha1', date('Y').date('m'));
$userHash = hash('sha1', $user->id . (string) $user->created_at);
$photo = $request->file('file');
$mimes = explode(',', config('pixelfed.media_types'));
@ -245,7 +243,7 @@ class BaseApiController extends Controller
return;
}
$storagePath = "public/m/{$monthHash}/{$userHash}";
$storagePath = MediaPathService::get($user, 2);
$path = $photo->store($storagePath);
$hash = \hash_file('sha256', $photo);