Merge pull request #5906 from annando/ap-switch

OStatus contacts are now automatically converted to AP
This commit is contained in:
Hypolite Petovan 2018-10-14 12:04:52 -04:00 committed by GitHub
commit 59d6dd809d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 10 deletions

View file

@ -303,6 +303,9 @@ class Processor
$item = ['author-id' => Contact::getIdForURL($activity['actor']),
'author-link' => $activity['actor']];
// Ensure that the contact has got the right network type
self::switchContact($item['author-id']);
Contact::addRelationship($owner, $contact, $item);
$cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {