From 44a4b66539da5a701f0da50a0d5f9da6192ab5a1 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 25 Oct 2020 20:40:25 +0000 Subject: [PATCH] Improved self contact detection --- src/Factory/Api/Mastodon/Account.php | 5 +++-- src/Object/Api/Mastodon/Instance.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Factory/Api/Mastodon/Account.php b/src/Factory/Api/Mastodon/Account.php index d7e94819e9..a2bd550a73 100644 --- 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 c52e59f8ab..6105a8bee1 100644 --- 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']); } }