mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update CollectionController

This commit is contained in:
Daniel Supernault 2022-10-01 05:36:07 -06:00
parent a843be966c
commit 84e152896b
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Http/Controllers/CollectionController.php
View File

@ -63,18 +63,18 @@ class CollectionController extends Controller
public function store(Request $request, $id) public function store(Request $request, $id)
{ {
abort_if(!Auth::check(), 403); abort_if(!$request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'title' => 'nullable|max:50', 'title' => 'nullable|max:50',
'description' => 'nullable|max:500', 'description' => 'nullable|max:500',
'visibility' => 'nullable|string|in:public,private,draft' 'visibility' => 'nullable|string|in:public,private,draft'
]); ]);
$profile = Auth::user()->profile; $pid = $request->user()->profile_id;
$collection = Collection::whereProfileId($profile->id)->findOrFail($id); $collection = Collection::whereProfileId($pid)->findOrFail($id);
$collection->title = e($request->input('title')); $collection->title = strip_tags($request->input('title'));
$collection->description = e($request->input('description')); $collection->description = strip_tags($request->input('description'));
$collection->visibility = e($request->input('visibility')); $collection->visibility = $request->input('visibility');
$collection->save(); $collection->save();
return CollectionService::setCollection($collection->id, $collection); return CollectionService::setCollection($collection->id, $collection);
@ -82,7 +82,7 @@ class CollectionController extends Controller
public function publish(Request $request, int $id) public function publish(Request $request, int $id)
{ {
abort_if(!Auth::check(), 403); abort_if(!$request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'title' => 'nullable|max:50', 'title' => 'nullable|max:50',
'description' => 'nullable|max:500', 'description' => 'nullable|max:500',
@ -94,8 +94,8 @@ class CollectionController extends Controller
abort(404); abort(404);
} }
$collection->title = e($request->input('title')); $collection->title = e($request->input('title'));
$collection->description = e($request->input('description')); $collection->description = strip_tags($request->input('description'));
$collection->visibility = e($request->input('visibility')); $collection->visibility = strip_tags($request->input('visibility'));
$collection->published_at = now(); $collection->published_at = now();
$collection->save(); $collection->save();
return CollectionService::setCollection($collection->id, $collection); return CollectionService::setCollection($collection->id, $collection);
@ -103,30 +103,32 @@ class CollectionController extends Controller
public function delete(Request $request, int $id) public function delete(Request $request, int $id)
{ {
abort_if(!Auth::check(), 403); abort_if(!$request->user(), 403);
$user = Auth::user(); $user = $request->user();
$collection = Collection::whereProfileId($user->profile_id)->findOrFail($id); $collection = Collection::whereProfileId($user->profile_id)->findOrFail($id);
$collection->items()->delete(); $collection->items()->delete();
$collection->delete(); $collection->delete();
CollectionService::deleteCollection($id);
if($request->wantsJson()) { if($request->wantsJson()) {
return 200; return 200;
} }
CollectionService::deleteCollection($id);
return redirect('/'); return redirect('/');
} }
public function storeId(Request $request) public function storeId(Request $request)
{ {
abort_if(!$request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'collection_id' => 'required|int|min:1|exists:collections,id', 'collection_id' => 'required|int|min:1|exists:collections,id',
'post_id' => 'required|int|min:1|exists:statuses,id' 'post_id' => 'required|int|min:1'
]); ]);
$profileId = Auth::user()->profile_id; $profileId = $request->user()->profile_id;
$collectionId = $request->input('collection_id'); $collectionId = $request->input('collection_id');
$postId = $request->input('post_id'); $postId = $request->input('post_id');
@ -151,6 +153,7 @@ class CollectionController extends Controller
} }
$status = Status::whereScope('public') $status = Status::whereScope('public')
->whereProfileId($profileId)
->whereIn('type', ['photo', 'photo:album', 'video']) ->whereIn('type', ['photo', 'photo:album', 'video'])
->findOrFail($postId); ->findOrFail($postId);
@ -277,12 +280,13 @@ class CollectionController extends Controller
public function deleteId(Request $request) public function deleteId(Request $request)
{ {
abort_if(!$request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'collection_id' => 'required|int|min:1|exists:collections,id', 'collection_id' => 'required|int|min:1|exists:collections,id',
'post_id' => 'required|int|min:1|exists:statuses,id' 'post_id' => 'required|int|min:1'
]); ]);
$profileId = Auth::user()->profile_id; $profileId = $request->user()->profile_id;
$collectionId = $request->input('collection_id'); $collectionId = $request->input('collection_id');
$postId = $request->input('post_id'); $postId = $request->input('post_id');

2
app/Services/CollectionService.php
View File

@ -121,6 +121,8 @@ class CollectionService
'published_at' => $collection->published_at, 'published_at' => $collection->published_at,
]; ];
Cache::put(self::CACHE_KEY . 'get:' . $id, $res, 86400); Cache::put(self::CACHE_KEY . 'get:' . $id, $res, 86400);
$res['avatar'] = $account['avatar'];
$res['username'] = $account['username'];
$res['post_count'] = self::count($id); $res['post_count'] = self::count($id);
return $res; return $res;
} }

4
routes/api.php
View File

@ -114,6 +114,10 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware); Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware);
Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware); Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware);
Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware); Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware);
Route::post('add', 'CollectionController@storeId')->middleware($middleware);
Route::post('update/{id}', 'CollectionController@store')->middleware($middleware);
Route::delete('delete/{id}', 'CollectionController@delete')->middleware($middleware);
Route::post('remove', 'CollectionController@deleteId')->middleware($middleware);
}); });
Route::group(['prefix' => 'direct'], function () use($middleware) { Route::group(['prefix' => 'direct'], function () use($middleware) {