diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php index eb3e819c..1384e519 100644 --- a/app/Transformer/Api/AccountTransformer.php +++ b/app/Transformer/Api/AccountTransformer.php @@ -14,14 +14,17 @@ class AccountTransformer extends Fractal\TransformerAbstract public function transform(Profile $profile) { - $is_admin = $profile->domain ? false : $profile->user->is_admin; + $local = $profile->domain == null; + $is_admin = !$local ? false : $profile->user->is_admin; + $acct = $local ? $profile->username : substr($profile->username, 1); + $username = $local ? $profile->username : explode('@', $profile->username)[0]; return [ 'id' => (string) $profile->id, - 'username' => $profile->username, - 'acct' => $profile->username, + 'username' => $username, + 'acct' => $acct, 'display_name' => $profile->name, 'locked' => (bool) $profile->is_private, - 'created_at' => null, + 'created_at' => $profile->created_at->toISOString(), 'followers_count' => $profile->followerCount(), 'following_count' => $profile->followingCount(), 'statuses_count' => (int) $profile->statusCount(), @@ -33,11 +36,13 @@ class AccountTransformer extends Fractal\TransformerAbstract 'header_static' => null, 'header_bg' => $profile->header_bg, 'moved' => null, - 'fields' => null, + 'fields' => [], 'bot' => null, 'website' => $profile->website, 'software' => 'pixelfed', 'is_admin' => (bool) $is_admin, + 'last_status_at' => null, + 'emojis' => [], ]; }