Improved self contact detection

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

diff --git a/src/Object/Api/Mastodon/Instance.php b/src/Object/Api/Mastodon/Instance.php
index c52e59f8ab0c1e7e999fa864e02b6560001b72b4..6105a8bee15c615c54f41987b8f2b5050c3f3a5a 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', 'uid'], ['nick' => $administrator['nickname'], 'self' => true]);
-                               $instance->contact_account = DI::mstdnAccount()->createFromContactId($adminContact['id'], $adminContact['uid']);
+                               $adminContact = DBA::selectFirst('contact', ['id'], ['nick' => $administrator['nickname'], 'self' => true]);
+                               $instance->contact_account = DI::mstdnAccount()->createFromContactId($adminContact['id']);
                        }
                }