X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub.php;h=c7c2623558da2981a935f18fd969ed74e83952cb;hb=f7b6fef1978975cc1784fdbf663523ebc999d1c0;hp=23eb861721279a4a66a454306696d7b0c0342ddc;hpb=ec0d3a6eac4b1a1551649253167c6eed96cdd53f;p=friendica.git diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index 23eb861721..c7c2623558 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -7,6 +7,7 @@ namespace Friendica\Protocol; use Friendica\Util\Network; use Friendica\Core\Protocol; use Friendica\Model\APContact; +use Friendica\Util\HTTPSignature; /** * @brief ActivityPub Protocol class @@ -29,12 +30,18 @@ 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/', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']]; @@ -53,11 +60,16 @@ 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 */ - public static function fetchContent($url) + public static function fetchContent($url, $uid = 0) { + 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;