Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 07:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve Api\Mastodon\Account with data from apcontact

Browse source 
- Original work by @annando
This commit is contained in:
Hypolite Petovan 2019-12-11 08:23:28 -05:00
parent cf72bde93d
commit 9a0a11ed39
2 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Api/Mastodon/FollowRequests.php
View file

@ -6,6 +6,7 @@ use Friendica\Api\Mastodon;
use Friendica\App\BaseURL;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\Introduction;
use Friendica\Module\Base\Api;
@ -88,7 +89,9 @@ class FollowRequests extends Api
$return = [];
foreach ($intros as $intro) {
$account = Mastodon\Account::createFromContact(Contact::getById($intro['contact-id']));
$contact = Contact::getById($intro['contact-id']);
$apcontact = APContact::getByURL($contact['url'], false);
$account = Mastodon\Account::createFromContact($contact, $apcontact);
// Not ideal, the same "account" can have multiple ids depending on the context
$account->id = $intro['id'];