From 8e71e0c03e9cb0a54b0453dae00fcad7687259eb Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 28 Mar 2023 20:21:54 -0600 Subject: [PATCH 1/2] Update ApiV1Controller, fix blocking remote accounts. Closes #4256 --- app/Http/Controllers/Api/ApiV1Controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 77df97704..9b79ab868 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1012,7 +1012,7 @@ class ApiV1Controller extends Controller $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'); } @@ -1047,7 +1047,7 @@ class ApiV1Controller extends Controller ]); RelationshipService::refresh($pid, $id); - + UserFilterService::block($pid, $id); $resource = new Fractal\Resource\Item($profile, new RelationshipTransformer()); $res = $this->fractal->createData($resource)->toArray(); From ccd82032df206f42b6385318b5604dd578b919a6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 28 Mar 2023 20:23:03 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30c456340..aca3e79a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Release Notes ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.5...dev) + +### Updates +- Update ApiV1Controller, fix blocking remote accounts. Closes #4256 ([8e71e0c0](https://github.com/pixelfed/pixelfed/commit/8e71e0c0)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.5 (2023-03-25)](https://github.com/pixelfed/pixelfed/compare/v0.11.4...v0.11.5)