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

Update ApiV1Controller, fix favourited_by and reblogged_by follows attribute

Browse source
This commit is contained in:
Daniel Supernault 2023-02-08 02:47:24 -07:00
parent 831c062da8
commit 1a130f3e33
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2519,8 +2519,13 @@ class ApiV1Controller extends Controller
$headers = ['Link' => $links]; $headers = ['Link' => $links];
} }
$res = $res->map(function($status) { $res = $res->map(function($status) use($user) {
return AccountService::get($status->profile_id); $account = AccountService::getMastodon($status->profile_id, true);
if(!$account) {
return false;
}
$account['follows'] = $status->profile_id == $user->profile_id ? null : FollowerService::follows($user->profile_id, $status->profile_id);
return $account;
}) })
->filter(function($account) { ->filter(function($account) {
return $account && isset($account['id']); return $account && isset($account['id']);
@ -2594,9 +2599,12 @@ class ApiV1Controller extends Controller
$headers = ['Link' => $links]; $headers = ['Link' => $links];
} }
$res = $res->map(function($like) { $res = $res->map(function($like) use($user) {
$account = AccountService::getMastodon($like->profile_id, true); $account = AccountService::getMastodon($like->profile_id, true);
$account['follows'] = isset($like->created_at); if(!$account) {
return false;
}
$account['follows'] = $like->profile_id == $user->profile_id ? null : FollowerService::follows($user->profile_id, $like->profile_id);
return $account; return $account;
}) })
->filter(function($account) use($user) { ->filter(function($account) use($user) {