Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 21:04:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5906 from annando/ap-switch

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
src/Protocol/ActivityPub/Processor.php
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)) {

2
src/Protocol/ActivityPub/Receiver.php
View file

@ -452,7 +452,7 @@ class Receiver
* @param integer $uid User ID
* @param string $url Profile URL
*/
private static function switchContact($cid, $uid, $url)
public static function switchContact($cid, $uid, $url)
{
$profile = ActivityPub::probeProfile($url);
if (empty($profile)) {