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

Merge pull request #5827 from annando/follow-on-switch 

Send a follow request upon contact switch to AP
This commit is contained in:
Hypolite Petovan 2018-10-05 19:39:38 -04:00 committed by GitHub
parent 3c7d41c388 5d7968bdf3
commit f287d76264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Protocol/ActivityPub/Receiver.php
View File

@ -357,11 +357,11 @@ class Receiver
}
/**
* @brief
* @brief Switches existing contacts to ActivityPub
*
* @param $cid
* @param integer $cid Contact ID
* @param integer $uid User ID
* @param $url
* @param string $url Profile URL
*/
private static function switchContact($cid, $uid, $url)
{
@ -370,7 +370,7 @@ class Receiver
return;
}
logger('Switch contact ' . $cid . ' (' . $profile['url'] . ') for user ' . $uid . ' from OStatus to ActivityPub');
logger('Switch contact ' . $cid . ' (' . $profile['url'] . ') for user ' . $uid . ' to ActivityPub');
$photo = $profile['photo'];
unset($profile['photo']);
@ -381,7 +381,11 @@ class Receiver
Contact::updateAvatar($photo, $uid, $cid);
/// @todo Send a new follow request to be sure that the connection still exists
// Send a new follow request to be sure that the connection still exists
if (($uid != 0) && DBA::exists('contact', ['id' => $cid, 'rel' => [Contact::SHARING, Contact::FRIEND]])) {
ActivityPub\Transmitter::sendActivity('Follow', $profile['url'], $uid);
logger('Send a new follow request to ' . $profile['url'] . ' for user ' . $uid, LOGGER_DEBUG);
}
}
/**