mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7969 from annando/api-instance

Browse source 
API: Provide data for the account array of the instance array
This commit is contained in:
Tobias Diekershoff 2019-12-19 06:43:08 +01:00 committed by GitHub
parent 5197833c55 da78b7a8b8
commit ac24bc92cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Api/Mastodon/Instance.php
View file

@ -7,11 +7,12 @@ use Friendica\Api\Mastodon\Account;
use Friendica\Api\Mastodon\Stats; use Friendica\Api\Mastodon\Stats;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\APContact;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Register; use Friendica\Module\Register;
/** /**
* Class Account * Class Instance
* *
* @see https://docs.joinmastodon.org/api/entities/#instance * @see https://docs.joinmastodon.org/api/entities/#instance
*/ */
@ -75,7 +76,8 @@ class Instance
$administrator = User::getByEmail($adminList[0], ['nickname']); $administrator = User::getByEmail($adminList[0], ['nickname']);
if (!empty($administrator)) { if (!empty($administrator)) {
$adminContact = DBA::selectFirst('contact', [], ['nick' => $administrator['nickname'], 'self' => true]); $adminContact = DBA::selectFirst('contact', [], ['nick' => $administrator['nickname'], 'self' => true]);
$instance->contact_account = Account::createFromContact($adminContact); $apcontact = APContact::getByURL($adminContact['url'], false);
$instance->contact_account = Account::createFromContact($adminContact, $apcontact);
} }
} }