clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add user contact data superseding to Mastodon\Account::create

Browse Source
This commit is contained in:
Hypolite Petovan
2019-12-26 20:06:28 -05:00
parent c286772fb5
commit 0dbce6e58b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Module/Api/Mastodon/FollowRequests.php
View File

@@ -105,8 +105,9 @@ class FollowRequests extends Api
}
$publicContact = Contact::getById($cdata['public']);
$userContact = Contact::getById($cdata['user']);
$apcontact = APContact::getByURL($publicContact['url'], false);
$account = Mastodon\Account::create($baseUrl, $publicContact, $apcontact);
$account = Mastodon\Account::create($baseUrl, $publicContact, $apcontact, $userContact);
// Not ideal, the same "account" can have multiple ids depending on the context
$account->id = $intro['id'];