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

Update AccountTransformer, fixes #1730

Browse source
This commit is contained in:
Daniel Supernault 2019-10-01 20:53:45 -06:00
parent 715166fc67
commit 21f262315d
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Transformer/Api/Mastodon/v1/AccountTransformer.php
View file

@ -4,6 +4,7 @@ namespace App\Transformer\Api\Mastodon\v1;
use App\Profile; use App\Profile;
use League\Fractal; use League\Fractal;
use Illuminate\Support\Str;
class AccountTransformer extends Fractal\TransformerAbstract class AccountTransformer extends Fractal\TransformerAbstract
{ {
@ -11,12 +12,11 @@ class AccountTransformer extends Fractal\TransformerAbstract
{ {
$local = $profile->domain == null; $local = $profile->domain == null;
$is_admin = !$local ? false : $profile->user->is_admin; $is_admin = !$local ? false : $profile->user->is_admin;
$acct = $local ? $profile->username . '@' . config('pixelfed.domain.app') : substr($profile->username, 1); $username = $local ? $profile->username : explode('@', substr($profile->username, 1))[0];
$username = $local ? $profile->username : explode('@', $acct)[0];
return [ return [
'id' => (string) $profile->id, 'id' => (string) $profile->id,
'username' => $username, 'username' => $username,
'acct' => $acct, 'acct' => $username,
'display_name' => $profile->name, 'display_name' => $profile->name,
'locked' => (bool) $profile->is_private, 'locked' => (bool) $profile->is_private,
'created_at' => $profile->created_at->toJSON(), 'created_at' => $profile->created_at->toJSON(),
@ -32,7 +32,7 @@ class AccountTransformer extends Fractal\TransformerAbstract
'emojis' => [], 'emojis' => [],
'moved' => null, 'moved' => null,
'fields' => null, 'fields' => null,
'bot' => null, 'bot' => false,
'software' => 'pixelfed', 'software' => 'pixelfed',
'is_admin' => (bool) $is_admin, 'is_admin' => (bool) $is_admin,
]; ];