UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update AccountController, include account entities in follow_requests.json endpoint

Browse source
This commit is contained in:
Daniel Supernault 2022-06-11 00:37:36 -06:00
parent 65cf9ccac9
commit aded149fae
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View file

@ -370,7 +370,7 @@ class AccountController extends Controller
'avatar' => $actor->avatarUrl(), 'avatar' => $actor->avatarUrl(),
'url' => $actor->url(), 'url' => $actor->url(),
'local' => $actor->domain == null, 'local' => $actor->domain == null,
'following' => $actor->followedBy(Auth::user()->profile) 'account' => AccountService::get($actor->id)
]; ];
}) })
]; ];

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

@ -442,7 +442,7 @@ class ApiV1Controller extends Controller
if($pid != $account['id']) { if($pid != $account['id']) {
if($account['locked']) { if($account['locked']) {
if(FollowerService::follows($pid, $account['id'])) { if(!FollowerService::follows($pid, $account['id'])) {
return []; return [];
} }
} }
@ -489,7 +489,7 @@ class ApiV1Controller extends Controller
if($pid != $account['id']) { if($pid != $account['id']) {
if($account['locked']) { if($account['locked']) {
if(FollowerService::follows($pid, $account['id'])) { if(!FollowerService::follows($pid, $account['id'])) {
return []; return [];
} }
} }

4
app/Http/Controllers/PublicApiController.php
View file

@ -738,7 +738,7 @@ class PublicApiController extends Controller
if($pid != $account['id']) { if($pid != $account['id']) {
if($account['locked']) { if($account['locked']) {
if(FollowerService::follows($pid, $account['id'])) { if(!FollowerService::follows($pid, $account['id'])) {
return []; return [];
} }
} }
@ -778,7 +778,7 @@ class PublicApiController extends Controller
if($pid != $account['id']) { if($pid != $account['id']) {
if($account['locked']) { if($account['locked']) {
if(FollowerService::follows($pid, $account['id'])) { if(!FollowerService::follows($pid, $account['id'])) {
return []; return [];
} }
} }