chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Update ApiV1Controller, fix blocking remote accounts. Closes #4256

Browse source
This commit is contained in:
Daniel Supernault 2023-03-28 20:21:54 -06:00
parent b7501ee46e
commit 8e71e0c03e
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1012,7 +1012,7 @@ class ApiV1Controller extends Controller
$profile = Profile::findOrFail($id); $profile = Profile::findOrFail($id);
if($profile->user->is_admin == true) { if($profile->user && $profile->user->is_admin == true) {
abort(400, 'You cannot block an admin'); abort(400, 'You cannot block an admin');
} }
@ -1047,7 +1047,7 @@ class ApiV1Controller extends Controller
]); ]);
RelationshipService::refresh($pid, $id); RelationshipService::refresh($pid, $id);
UserFilterService::block($pid, $id);
$resource = new Fractal\Resource\Item($profile, new RelationshipTransformer()); $resource = new Fractal\Resource\Item($profile, new RelationshipTransformer());
$res = $this->fractal->createData($resource)->toArray(); $res = $this->fractal->createData($resource)->toArray();