Display the user fields for the admin account

diff --git a/src/Factory/Api/Mastodon/Account.php b/src/Factory/Api/Mastodon/Account.php
index a7aa642450408eca9451eb7aa460219c3b2f12d8..d7e94819e9a0946b770707c21192e1dcdf3d8bfa 100644 (file)
--- a/src/Factory/Api/Mastodon/Account.php
+++ b/src/Factory/Api/Mastodon/Account.php
@@ -69,8 +69,12 @@ class Account extends BaseFactory
 
                $apcontact = APContact::getByURL($publicContact['url'], false);
 
-               $profileFields = $this->profileField->select(['uid' => $uid, 'psid' => PermissionSet::PUBLIC]);
-               $fields        = $this->mstdnField->createFromProfileFields($profileFields);
+               if (!empty($userContact['self'])) {
+                       $profileFields = $this->profileField->select(['uid' => $uid, 'psid' => PermissionSet::PUBLIC]);
+                       $fields        = $this->mstdnField->createFromProfileFields($profileFields);
+               } else {
+                       $fields = new Fields();
+               }
 
                return new \Friendica\Object\Api\Mastodon\Account($this->baseUrl, $publicContact, $fields, $apcontact, $userContact);
        }

diff --git a/src/Object/Api/Mastodon/Instance.php b/src/Object/Api/Mastodon/Instance.php
index 6105a8bee15c615c54f41987b8f2b5050c3f3a5a..c52e59f8ab0c1e7e999fa864e02b6560001b72b4 100644 (file)
--- a/src/Object/Api/Mastodon/Instance.php
+++ b/src/Object/Api/Mastodon/Instance.php
@@ -93,8 +93,8 @@ class Instance extends BaseEntity
                        $adminList = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
                        $administrator = User::getByEmail($adminList[0], ['nickname']);
                        if (!empty($administrator)) {
-                               $adminContact = DBA::selectFirst('contact', ['id'], ['nick' => $administrator['nickname'], 'self' => true]);
-                               $instance->contact_account = DI::mstdnAccount()->createFromContactId($adminContact['id']);
+                               $adminContact = DBA::selectFirst('contact', ['id', 'uid'], ['nick' => $administrator['nickname'], 'self' => true]);
+                               $instance->contact_account = DI::mstdnAccount()->createFromContactId($adminContact['id'], $adminContact['uid']);
                        }
                }