mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-21 21:57:06 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -47,6 +47,7 @@ use App\Jobs\VideoPipeline\{
}; };
use App\Services\{ use App\Services\{
NotificationService, NotificationService,
MediaPathService,
SearchApiV2Service SearchApiV2Service
}; };
@ -646,6 +647,10 @@ class ApiV1Controller extends Controller
$profile = Profile::findOrFail($id); $profile = Profile::findOrFail($id);
if($profile->user->is_admin == true) {
abort(400, 'You cannot block an admin');
}
Follower::whereProfileId($profile->id)->whereFollowingId($pid)->delete(); Follower::whereProfileId($profile->id)->whereFollowingId($pid)->delete();
Follower::whereProfileId($pid)->whereFollowingId($profile->id)->delete(); Follower::whereProfileId($pid)->whereFollowingId($profile->id)->delete();
Notification::whereProfileId($pid)->whereActorId($profile->id)->delete(); Notification::whereProfileId($pid)->whereActorId($profile->id)->delete();
@ -1030,9 +1035,6 @@ class ApiV1Controller extends Controller
$filterClass = in_array($request->input('filter_class'), Filter::classes()) ? $request->input('filter_class') : null; $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; $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'); $photo = $request->file('file');
$mimes = explode(',', config('pixelfed.media_types')); $mimes = explode(',', config('pixelfed.media_types'));
@ -1040,7 +1042,7 @@ class ApiV1Controller extends Controller
abort(403, 'Invalid or unsupported mime type.'); abort(403, 'Invalid or unsupported mime type.');
} }
$storagePath = "public/m/{$monthHash}/{$userHash}"; $storagePath = MediaPathService::get($user, 2);
$path = $photo->store($storagePath); $path = $photo->store($storagePath);
$hash = \hash_file('sha256', $photo); $hash = \hash_file('sha256', $photo);
@ -1916,7 +1918,7 @@ class ApiV1Controller extends Controller
foreach($bookmarks as $id) { foreach($bookmarks as $id) {
$res[] = \App\Services\StatusService::get($id); $res[] = \App\Services\StatusService::get($id);
} }
return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES); return $res;
} }
/** /**

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

@ -35,6 +35,7 @@ use App\Jobs\VideoPipeline\{
VideoThumbnail VideoThumbnail
}; };
use App\Services\NotificationService; use App\Services\NotificationService;
use App\Services\MediaPathService;
class BaseApiController extends Controller 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; $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; $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'); $photo = $request->file('file');
$mimes = explode(',', config('pixelfed.media_types')); $mimes = explode(',', config('pixelfed.media_types'));
@ -245,7 +243,7 @@ class BaseApiController extends Controller
return; return;
} }
$storagePath = "public/m/{$monthHash}/{$userHash}"; $storagePath = MediaPathService::get($user, 2);
$path = $photo->store($storagePath); $path = $photo->store($storagePath);
$hash = \hash_file('sha256', $photo); $hash = \hash_file('sha256', $photo);