diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index a4e86aee3..02921368d 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -370,7 +370,7 @@ class AccountController extends Controller 'avatar' => $actor->avatarUrl(), 'url' => $actor->url(), 'local' => $actor->domain == null, - 'following' => $actor->followedBy(Auth::user()->profile) + 'account' => AccountService::get($actor->id) ]; }) ]; diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index ae1bb5f5e..37268fed5 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -442,7 +442,7 @@ class ApiV1Controller extends Controller if($pid != $account['id']) { if($account['locked']) { - if(FollowerService::follows($pid, $account['id'])) { + if(!FollowerService::follows($pid, $account['id'])) { return []; } } @@ -489,7 +489,7 @@ class ApiV1Controller extends Controller if($pid != $account['id']) { if($account['locked']) { - if(FollowerService::follows($pid, $account['id'])) { + if(!FollowerService::follows($pid, $account['id'])) { return []; } } diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index e6f3bf428..5171509d3 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -738,7 +738,7 @@ class PublicApiController extends Controller if($pid != $account['id']) { if($account['locked']) { - if(FollowerService::follows($pid, $account['id'])) { + if(!FollowerService::follows($pid, $account['id'])) { return []; } } @@ -778,7 +778,7 @@ class PublicApiController extends Controller if($pid != $account['id']) { if($account['locked']) { - if(FollowerService::follows($pid, $account['id'])) { + if(!FollowerService::follows($pid, $account['id'])) { return []; } }