X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub.php;h=fa63c44d574bcb9b8f2f6af54707f3cd721f6229;hb=8a0c568fe103e2e7ef832a623bfb6be6c54e300a;hp=e7614afa99fa1f06ee3fa994dcb78dbbca6a6840;hpb=41123162f14fa83cd566e24da8faafa04b40140f;p=friendica.git diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index e7614afa99..fa63c44d57 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -4,9 +4,11 @@ */ namespace Friendica\Protocol; +use Friendica\Util\JsonLD; use Friendica\Util\Network; use Friendica\Core\Protocol; use Friendica\Model\APContact; +use Friendica\Util\HTTPSignature; /** * @brief ActivityPub Protocol class @@ -29,22 +31,28 @@ use Friendica\Model\APContact; * * To-do: * - Polling the outboxes for missing content? + * + * Missing parts from DFRN: + * - Public Forum + * - Private Forum + * - Relocation */ class ActivityPub { const PUBLIC_COLLECTION = 'https://www.w3.org/ns/activitystreams#Public'; const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1', ['vcard' => 'http://www.w3.org/2006/vcard/ns#', + 'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/', 'diaspora' => 'https://diasporafoundation.org/ns/', + 'litepub' => 'http://litepub.social/ns#', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', - 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']]; + 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag', + 'directMessage' => 'litepub:directMessage']]; const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application']; - const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image']; - const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept']; /** * Checks if the web request is done for the AP protocol * - * @return is it AP? + * @return bool is it AP? */ public static function isRequest() { @@ -55,28 +63,43 @@ class ActivityPub /** * Fetches ActivityPub content from the given url * - * @param string $url content url + * @param string $url content url + * @param integer $uid User ID for the signature * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function fetchContent($url) + public static function fetchContent($url, $uid = 0) { - $ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']); - if (!$ret['success'] || empty($ret['body'])) { + if (!empty($uid)) { + return HTTPSignature::fetch($url, $uid); + } + + $curlResult = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']); + if (!$curlResult->isSuccess() || empty($curlResult->getBody())) { + return false; + } + + $content = json_decode($curlResult->getBody(), true); + + if (empty($content) || !is_array($content)) { return false; } - return json_decode($ret['body'], true); + return $content; } /** * Fetches a profile from the given url into an array that is compatible to Probe::uri * - * @param string $url profile url + * @param string $url profile url + * @param boolean $update Update the profile * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function probeProfile($url) + public static function probeProfile($url, $update = true) { - $apcontact = APContact::getByURL($url, true); + $apcontact = APContact::getByURL($url, $update); if (empty($apcontact)) { return false; } @@ -112,8 +135,9 @@ class ActivityPub /** * Fetches activities from the outbox of a given profile and processes it * - * @param string $url + * @param string $url * @param integer $uid User ID + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function fetchOutbox($url, $uid) { @@ -134,7 +158,8 @@ class ActivityPub } foreach ($items as $activity) { - ActivityPub\Receiver::processActivity($activity, '', $uid, true); + $ldactivity = JsonLD::compact($activity); + ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true); } } }