X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub.php;h=c7c2623558da2981a935f18fd969ed74e83952cb;hb=f7b6fef1978975cc1784fdbf663523ebc999d1c0;hp=bd125aaaef1d3a03dce762c29e060e3a0645b496;hpb=0d51474e73dc50ac0b7159cb92fcadeafb976fc1;p=friendica.git

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index bd125aaaef..c7c2623558 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -4,22 +4,10 @@
  */
 namespace Friendica\Protocol;
 
-use Friendica\Database\DBA;
-use Friendica\Core\System;
-use Friendica\BaseObject;
 use Friendica\Util\Network;
-use Friendica\Util\HTTPSignature;
 use Friendica\Core\Protocol;
-use Friendica\Model\Conversation;
-use Friendica\Model\Contact;
-use Friendica\Model\Item;
-use Friendica\Model\Term;
-use Friendica\Model\User;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Crypto;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
-use Friendica\Util\JsonLD;
+use Friendica\Model\APContact;
+use Friendica\Util\HTTPSignature;
 
 /**
  * @brief ActivityPub Protocol class
@@ -33,724 +21,67 @@ use Friendica\Util\JsonLD;
  *
  * Digest: https://tools.ietf.org/html/rfc5843
  * https://tools.ietf.org/html/draft-cavage-http-signatures-10#ref-15
- * https://github.com/digitalbazaar/php-json-ld
  *
- * Part of the code for HTTP signing is taken from the Osada project.
- * https://framagit.org/macgirvin/osada
+ * Mastodon implementation of supported activities:
+ * https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/activity.rb#L26
  *
- * To-do:
+ * Funkwhale:
+ * http://docs-funkwhale-funkwhale-549-music-federation-documentation.preview.funkwhale.audio/federation/index.html
  *
- * Receiver:
- * - Activities: Dislike, Update, Delete
- * - Object Types: Person, Tombstome
- *
- * Transmitter:
- * - Activities: Like, Dislike, Update, Delete
- * - Object Tyoes: Article, Announce, Person, Tombstone
+ * To-do:
+ * - Polling the outboxes for missing content?
  *
- * General:
- * - Message distribution
- * - Endpoints: Outbox, Object, Follower, Following
- * - General cleanup
+ * Missing parts from DFRN:
+ * - Public Forum
+ * - Private Forum
+ * - Relocation
  */
 class ActivityPub
 {
-	const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
-
-	public static function isRequest()
-	{
-		return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
-			stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
-	}
-
-	public static function transmit($data, $target, $uid)
-	{
-		$owner = User::getOwnerDataById($uid);
-
-		if (!$owner) {
-			return;
-		}
-
-		$content = json_encode($data);
-
-		// Header data that is about to be signed.
-		$host = parse_url($target, PHP_URL_HOST);
-		$path = parse_url($target, PHP_URL_PATH);
-		$digest = 'SHA-256=' . base64_encode(hash('sha256', $content, true));
-		$content_length = strlen($content);
-
-		$headers = ['Content-Length: ' . $content_length, 'Digest: ' . $digest, 'Host: ' . $host];
-
-		$signed_data = "(request-target): post " . $path . "\ncontent-length: " . $content_length . "\ndigest: " . $digest . "\nhost: " . $host;
-
-		$signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256'));
-
-		$headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) content-length digest host",signature="' . $signature . '"';
-
-		$headers[] = 'Content-Type: application/activity+json';
-
-		Network::post($target, $content, $headers);
-		$return_code = BaseObject::getApp()->get_curl_code();
-
-		logger('Transmit to ' . $target . ' returned ' . $return_code);
-	}
-
+	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']];
+	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
 	/**
-	 * Return the ActivityPub profile of the given user
+	 * Checks if the web request is done for the AP protocol
 	 *
-	 * @param integer $uid User ID
-	 * @return array
+	 * @return is it AP?
 	 */
-	public static function profile($uid)
-	{
-		$accounttype = ['Person', 'Organization', 'Service', 'Group', 'Application', 'page-flags'];
-		$condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
-			'account_removed' => false, 'verified' => true];
-		$fields = ['guid', 'nickname', 'pubkey', 'account-type'];
-		$user = DBA::selectFirst('user', $fields, $condition);
-		if (!DBA::isResult($user)) {
-			return [];
-		}
-
-		$fields = ['locality', 'region', 'country-name'];
-		$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
-		if (!DBA::isResult($profile)) {
-			return [];
-		}
-
-		$fields = ['name', 'url', 'location', 'about', 'avatar'];
-		$contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
-		if (!DBA::isResult($contact)) {
-			return [];
-		}
-
-		$data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-			['vcard' => 'http://www.w3.org/2006/vcard/ns#', 'uuid' => 'http://schema.org/identifier',
-			'sensitive' => 'as:sensitive', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers']]];
-
-		$data['id'] = $contact['url'];
-		$data['uuid'] = $user['guid'];
-		$data['type'] = $accounttype[$user['account-type']];
-		$data['following'] = System::baseUrl() . '/following/' . $user['nickname'];
-		$data['followers'] = System::baseUrl() . '/followers/' . $user['nickname'];
-		$data['inbox'] = System::baseUrl() . '/inbox/' . $user['nickname'];
-		$data['outbox'] = System::baseUrl() . '/outbox/' . $user['nickname'];
-		$data['preferredUsername'] = $user['nickname'];
-		$data['name'] = $contact['name'];
-		$data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
-			'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
-		$data['summary'] = $contact['about'];
-		$data['url'] = $contact['url'];
-		$data['manuallyApprovesFollowers'] = in_array($profile['page-flags'], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP]);
-		$data['publicKey'] = ['id' => $contact['url'] . '#main-key',
-			'owner' => $contact['url'],
-			'publicKeyPem' => $user['pubkey']];
-		$data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox'];
-		$data['icon'] = ['type' => 'Image',
-			'url' => $contact['avatar']];
-
-		// tags: https://kitty.town/@inmysocks/100656097926961126.json
-		return $data;
-	}
-
-	public static function createPermissionBlockForItem($item)
-	{
-		$data = ['to' => [], 'cc' => []];
-
-		$terms = Term::tagArrayFromItemId($item['id']);
-
-		if (!$item['private']) {
-			$data['to'][] = self::PUBLIC;
-			$data['cc'][] = System::baseUrl() . '/followers/' . $item['author-nick'];
-
-			foreach ($terms as $term) {
-				if ($term['type'] != TERM_MENTION) {
-					continue;
-				}
-				$profile = self::fetchprofile($term['url']);
-				if (!empty($profile)) {
-					$data['cc'][] = $profile['url'];
-				}
-			}
-		} else {
-			//$data['cc'][] = System::baseUrl() . '/followers/' . $item['author-nick'];
-			$receiver_list = Item::enumeratePermissions($item);
-
-			$mentioned = [];
-
-			foreach ($terms as $term) {
-				if ($term['type'] != TERM_MENTION) {
-					continue;
-				}
-				$cid = Contact::getIdForURL($term['url'], $item['uid']);
-				if (!empty($cid) && in_array($cid, $receiver_list)) {
-					$contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
-					$data['to'][] = $contact['url'];
-				}
-			}
-
-			foreach ($receiver_list as $receiver) {
-				$contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
-				$data['cc'][] = $contact['url'];
-			}
-
-			if (empty($data['to'])) {
-				$data['to'] = $data['cc'];
-				$data['cc'] = [];
-			}
-		}
-
-		return $data;
-	}
-
-	public static function fetchTargetInboxes($item)
-	{
-		$inboxes = [];
-
-		$terms = Term::tagArrayFromItemId($item['id']);
-		if (!$item['private']) {
-			$contacts = DBA::select('contact', ['notify', 'batch'], ['uid' => $item['uid'],
-					'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB]);
-			while ($contact = DBA::fetch($contacts)) {
-				$contact = defaults($contact, 'batch', $contact['notify']);
-				$inboxes[$contact] = $contact;
-			}
-			DBA::close($contacts);
-
-			foreach ($terms as $term) {
-				if ($term['type'] != TERM_MENTION) {
-					continue;
-				}
-				$profile = self::fetchprofile($term['url']);
-				if (!empty($profile)) {
-					$target = defaults($profile, 'sharedinbox', $profile['inbox']);
-					$inboxes[$target] = $target;
-				}
-			}
-		} else {
-			$receiver_list = Item::enumeratePermissions($item);
-
-			$mentioned = [];
-
-			foreach ($terms as $term) {
-				if ($term['type'] != TERM_MENTION) {
-					continue;
-				}
-				$cid = Contact::getIdForURL($term['url'], $item['uid']);
-				if (!empty($cid) && in_array($cid, $receiver_list)) {
-					$contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
-					$profile = self::fetchprofile($contact['url']);
-					if (!empty($profile['network'])) {
-						$target = defaults($profile, 'sharedinbox', $profile['inbox']);
-						$inboxes[$target] = $target;
-					}
-				}
-			}
-
-			foreach ($receiver_list as $receiver) {
-				$contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
-				$profile = self::fetchprofile($contact['url']);
-				if (!empty($profile['network'])) {
-					$target = defaults($profile, 'sharedinbox', $profile['inbox']);
-					$inboxes[$target] = $target;
-				}
-			}
-		}
-
-		$profile = self::fetchprofile($item['author-link']);
-		if (!empty($profile['sharedinbox'])) {
-			unset($inboxes[$profile['sharedinbox']]);
-		}
-
-		if (!empty($profile['inbox'])) {
-			unset($inboxes[$profile['inbox']]);
-		}
-
-		return $inboxes;
-	}
-
-	public static function createActivityFromItem($item_id)
-	{
-		$item = Item::selectFirst([], ['id' => $item_id]);
-
-		if (!DBA::isResult($item)) {
-			return false;
-		}
-
-		$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
-		$conversation = DBA::selectFirst('conversation', ['source'], $condition);
-		if (DBA::isResult($conversation)) {
-			$data = json_decode($conversation['source']);
-			if (!empty($data)) {
-				return $data;
-			}
-		}
-
-		$data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-			['ostatus' => 'http://ostatus.org#', 'sensitive' => 'as:sensitive',
-			'Hashtag' => 'as:Hashtag', 'atomUri' => 'ostatus:atomUri',
-			'conversation' => 'ostatus:conversation',
-			'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
-
-		$data['type'] = 'Create';
-		$data['id'] = $item['uri'] . '#activity';
-		$data['actor'] = $item['author-link'];
-
-		$data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
-
-		if ($item["created"] != $item["edited"]) {
-			$data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
-		}
-
-		$data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
-
-		$data['object'] = self::createNote($item);
-		return $data;
-	}
-
-	public static function createObjectFromItemID($item_id)
-	{
-		$item = Item::selectFirst([], ['id' => $item_id]);
-
-		if (!DBA::isResult($item)) {
-			return false;
-		}
-
-		$data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-			['ostatus' => 'http://ostatus.org#', 'sensitive' => 'as:sensitive',
-			'Hashtag' => 'as:Hashtag', 'atomUri' => 'ostatus:atomUri',
-			'conversation' => 'ostatus:conversation',
-			'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
-
-		$data = array_merge($data, self::createNote($item));
-
-
-		return $data;
-	}
-
-	private static function createTagList($item)
-	{
-		$tags = [];
-
-		$terms = Term::tagArrayFromItemId($item['id']);
-		foreach ($terms as $term) {
-			if ($term['type'] == TERM_MENTION) {
-				$contact = Contact::getDetailsByURL($term['url']);
-				if (!empty($contact['addr'])) {
-					$mention = '@' . $contact['addr'];
-				} else {
-					$mention = '@' . $term['url'];
-				}
-
-				$tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
-			}
-		}
-
-		return $tags;
-	}
-
-	public static function createNote($item)
-	{
-		$data = [];
-		$data['type'] = 'Note';
-		$data['id'] = $item['uri'];
-
-		if ($item['uri'] != $item['thr-parent']) {
-			$data['inReplyTo'] = $item['thr-parent'];
-		}
-
-		$conversation = DBA::selectFirst('conversation', ['conversation-uri'], ['item-uri' => $item['parent-uri']]);
-		if (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
-			$conversation_uri = $conversation['conversation-uri'];
-		} else {
-			$conversation_uri = $item['parent-uri'];
-		}
-
-		$data['context'] = $data['conversation'] = $conversation_uri;
-		$data['actor'] = $item['author-link'];
-		$data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
-		$data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
-
-		if ($item["created"] != $item["edited"]) {
-			$data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
-		}
-
-		$data['attributedTo'] = $item['author-link'];
-		$data['name'] = BBCode::convert($item['title'], false, 7);
-		$data['content'] = BBCode::convert($item['body'], false, 7);
-		$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
-		$data['summary'] = ''; // Ignore by now
-		$data['sensitive'] = false; // - Query NSFW
-		//$data['emoji'] = []; // Ignore by now
-		$data['tag'] = self::createTagList($item);
-		$data['attachment'] = []; // @ToDo
-		return $data;
-	}
-
-	public static function transmitActivity($activity, $target, $uid)
-	{
-		$profile = self::fetchprofile($target);
-
-		$owner = User::getOwnerDataById($uid);
-
-		$data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-			'id' => System::baseUrl() . '/activity/' . System::createGUID(),
-			'type' => $activity,
-			'actor' => $owner['url'],
-			'object' => $profile['url'],
-			'to' => $profile['url']];
-
-		logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
-		return self::transmit($data,  $profile['inbox'], $uid);
-	}
-
-	public static function transmitContactAccept($target, $id, $uid)
-	{
-		$profile = self::fetchprofile($target);
-
-		$owner = User::getOwnerDataById($uid);
-		$data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-			'id' => System::baseUrl() . '/activity/' . System::createGUID(),
-			'type' => 'Accept',
-			'actor' => $owner['url'],
-			'object' => ['id' => $id, 'type' => 'Follow',
-				'actor' => $profile['url'],
-				'object' => $owner['url']],
-			'to' => $profile['url']];
-
-		logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
-		return self::transmit($data,  $profile['inbox'], $uid);
-	}
-
-	public static function transmitContactReject($target, $id, $uid)
-	{
-		$profile = self::fetchprofile($target);
-
-		$owner = User::getOwnerDataById($uid);
-		$data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-			'id' => System::baseUrl() . '/activity/' . System::createGUID(),
-			'type' => 'Reject',
-			'actor' => $owner['url'],
-			'object' => ['id' => $id, 'type' => 'Follow',
-				'actor' => $profile['url'],
-				'object' => $owner['url']],
-			'to' => $profile['url']];
-
-		logger('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
-		return self::transmit($data,  $profile['inbox'], $uid);
-	}
-
-	public static function transmitContactUndo($target, $uid)
-	{
-		$profile = self::fetchprofile($target);
-
-		$id = System::baseUrl() . '/activity/' . System::createGUID();
-
-		$owner = User::getOwnerDataById($uid);
-		$data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-			'id' => $id,
-			'type' => 'Undo',
-			'actor' => $owner['url'],
-			'object' => ['id' => $id, 'type' => 'Follow',
-				'actor' => $owner['url'],
-				'object' => $profile['url']],
-			'to' => $profile['url']];
-
-		logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
-		return self::transmit($data,  $profile['inbox'], $uid);
-	}
-
-	/**
-	 * Fetches ActivityPub content from the given url
-	 *
-	 * @param string $url content url
-	 * @return array
-	 */
-	public static function fetchContent($url)
-	{
-		$ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
-		if (!$ret['success'] || empty($ret['body'])) {
-			return;
-		}
-
-		return json_decode($ret['body'], true);
-	}
-
-	/**
-	 * Resolves the profile url from the address by using webfinger
-	 *
-	 * @param string $addr profile address (user@domain.tld)
-	 * @return string url
-	 */
-	private static function addrToUrl($addr)
-	{
-		$addr_parts = explode('@', $addr);
-		if (count($addr_parts) != 2) {
-			return false;
-		}
-
-		$webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
-
-		$ret = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
-		if (!$ret['success'] || empty($ret['body'])) {
-			return false;
-		}
-
-		$data = json_decode($ret['body'], true);
-
-		if (empty($data['links'])) {
-			return false;
-		}
-
-		foreach ($data['links'] as $link) {
-			if (empty($link['href']) || empty($link['rel']) || empty($link['type'])) {
-				continue;
-			}
-
-			if (($link['rel'] == 'self') && ($link['type'] == 'application/activity+json')) {
-				return $link['href'];
-			}
-		}
-
-		return false;
-	}
-
-	public static function verifySignature($content, $http_headers)
-	{
-		$object = json_decode($content, true);
-
-		if (empty($object)) {
-			return false;
-		}
-
-		$actor = JsonLD::fetchElement($object, 'actor', 'id');
-
-		$headers = [];
-		$headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . $http_headers['REQUEST_URI'];
-
-		// First take every header
-		foreach ($http_headers as $k => $v) {
-			$field = str_replace('_', '-', strtolower($k));
-			$headers[$field] = $v;
-		}
-
-		// Now add every http header
-		foreach ($http_headers as $k => $v) {
-			if (strpos($k, 'HTTP_') === 0) {
-				$field = str_replace('_', '-', strtolower(substr($k, 5)));
-				$headers[$field] = $v;
-			}
-		}
-
-		$sig_block = ActivityPub::parseSigHeader($http_headers['HTTP_SIGNATURE']);
-
-		if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) {
-			return false;
-		}
-
-		$signed_data = '';
-		foreach ($sig_block['headers'] as $h) {
-			if (array_key_exists($h, $headers)) {
-				$signed_data .= $h . ': ' . $headers[$h] . "\n";
-			}
-		}
-		$signed_data = rtrim($signed_data, "\n");
-
-		if (empty($signed_data)) {
-			return false;
-		}
-
-		$algorithm = null;
-
-		if ($sig_block['algorithm'] === 'rsa-sha256') {
-			$algorithm = 'sha256';
-		}
-
-		if ($sig_block['algorithm'] === 'rsa-sha512') {
-			$algorithm = 'sha512';
-		}
-
-		if (empty($algorithm)) {
-			return false;
-		}
-
-		$key = self::fetchKey($sig_block['keyId'], $actor);
-
-		if (empty($key)) {
-			return false;
-		}
-
-		if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm)) {
-			return false;
-		}
-
-		// Check the digest when it is part of the signed data
-		if (in_array('digest', $sig_block['headers'])) {
-			$digest = explode('=', $headers['digest'], 2);
-			if ($digest[0] === 'SHA-256') {
-				$hashalg = 'sha256';
-			}
-			if ($digest[0] === 'SHA-512') {
-				$hashalg = 'sha512';
-			}
-
-			/// @todo add all hashes from the rfc
-
-			if (!empty($hashalg) && base64_encode(hash($hashalg, $content, true)) != $digest[1]) {
-				return false;
-			}
-		}
-
-		// Check the content-length when it is part of the signed data
-		if (in_array('content-length', $sig_block['headers'])) {
-			if (strlen($content) != $headers['content-length']) {
-				return false;
-			}
-		}
-
-		return true;
-
-	}
-
-	private static function fetchKey($id, $actor)
-	{
-		$url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id);
-
-		$profile = self::fetchprofile($url);
-		if (!empty($profile)) {
-			return $profile['pubkey'];
-		} elseif ($url != $actor) {
-			$profile = self::fetchprofile($actor);
-			if (!empty($profile)) {
-				return $profile['pubkey'];
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @brief
-	 *
-	 * @param string $header
-	 * @return array associate array with
-	 *   - \e string \b keyID
-	 *   - \e string \b algorithm
-	 *   - \e array  \b headers
-	 *   - \e string \b signature
-	 */
-	private static function parseSigHeader($header)
+	public static function isRequest()
 	{
-		$ret = [];
-		$matches = [];
-
-		if (preg_match('/keyId="(.*?)"/ism',$header,$matches)) {
-			$ret['keyId'] = $matches[1];
-		}
-
-		if (preg_match('/algorithm="(.*?)"/ism',$header,$matches)) {
-			$ret['algorithm'] = $matches[1];
-		}
-
-		if (preg_match('/headers="(.*?)"/ism',$header,$matches)) {
-			$ret['headers'] = explode(' ', $matches[1]);
-		}
-
-		if (preg_match('/signature="(.*?)"/ism',$header,$matches)) {
-			$ret['signature'] = base64_decode(preg_replace('/\s+/','',$matches[1]));
-		}
-
-		return $ret;
+		return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
+			stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
 	}
 
-	public static function fetchprofile($url, $update = false)
-	{
-		if (empty($url)) {
-			return false;
-		}
-
-		if (!$update) {
-			$apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
-			}
-
-			$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
-			}
-
-			$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
-			}
-		}
-
-		if (empty(parse_url($url, PHP_URL_SCHEME))) {
-			$url = self::addrToUrl($url);
-			if (empty($url)) {
-				return false;
-			}
-		}
-
-		$data = self::fetchContent($url);
-
-		if (empty($data) || empty($data['id']) || empty($data['inbox'])) {
-			return false;
-		}
-
-		$apcontact = [];
-		$apcontact['url'] = $data['id'];
-		$apcontact['uuid'] = defaults($data, 'uuid', null);
-		$apcontact['type'] = defaults($data, 'type', null);
-		$apcontact['following'] = defaults($data, 'following', null);
-		$apcontact['followers'] = defaults($data, 'followers', null);
-		$apcontact['inbox'] = defaults($data, 'inbox', null);
-		$apcontact['outbox'] = defaults($data, 'outbox', null);
-		$apcontact['sharedinbox'] = JsonLD::fetchElement($data, 'endpoints', 'sharedInbox');
-		$apcontact['nick'] = defaults($data, 'preferredUsername', null);
-		$apcontact['name'] = defaults($data, 'name', $apcontact['nick']);
-		$apcontact['about'] = defaults($data, 'summary', '');
-		$apcontact['photo'] = JsonLD::fetchElement($data, 'icon', 'url');
-		$apcontact['alias'] = JsonLD::fetchElement($data, 'url', 'href');
-
-		$parts = parse_url($apcontact['url']);
-		unset($parts['scheme']);
-		unset($parts['path']);
-		$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
-
-		$apcontact['pubkey'] = trim(JsonLD::fetchElement($data, 'publicKey', 'publicKeyPem'));
-
-		// To-Do
-		// manuallyApprovesFollowers
-
-		// Unhandled
-		// @context, tag, attachment, image, nomadicLocations, signature, following, followers, featured, movedTo, liked
-
-		// Unhandled from Misskey
-		// sharedInbox, isCat
-
-		// Unhandled from Kroeg
-		// kroeg:blocks, updated
-
-		// Check if the address is resolvable
-		if (self::addrToUrl($apcontact['addr']) == $apcontact['url']) {
-			$parts = parse_url($apcontact['url']);
-			unset($parts['path']);
-			$apcontact['baseurl'] = Network::unparseURL($parts);
-		} else {
-			$apcontact['addr'] = null;
+	/**
+	 * Fetches ActivityPub content from the given url
+	 *
+	 * @param string  $url content url
+	 * @param integer $uid User ID for the signature
+	 * @return array
+	 */
+	public static function fetchContent($url, $uid = 0)
+	{
+		if (!empty($uid)) {
+			return HTTPSignature::fetch($url, $uid);
 		}
 
-		if ($apcontact['url'] == $apcontact['alias']) {
-			$apcontact['alias'] = null;
+		$curlResult = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
+		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
+			return false;
 		}
 
-		$apcontact['updated'] = DateTimeFormat::utcNow();
+		$content = json_decode($curlResult->getBody(), true);
 
-		DBA::update('apcontact', $apcontact, ['url' => $url], true);
+		if (empty($content) || !is_array($content)) {
+			return false;
+		}
 
-		return $apcontact;
+		return $content;
 	}
 
 	/**
@@ -761,7 +92,7 @@ class ActivityPub
 	 */
 	public static function probeProfile($url)
 	{
-		$apcontact = self::fetchprofile($url, true);
+		$apcontact = APContact::getByURL($url, true);
 		if (empty($apcontact)) {
 			return false;
 		}
@@ -794,26 +125,13 @@ class ActivityPub
 		return $profile;
 	}
 
-	public static function processInbox($body, $header, $uid)
-	{
-		logger('Incoming message for user ' . $uid, LOGGER_DEBUG);
-
-		if (!self::verifySignature($body, $header)) {
-			logger('Invalid signature, message will be discarded.', LOGGER_DEBUG);
-			return;
-		}
-
-		$activity = json_decode($body, true);
-
-		if (!is_array($activity)) {
-			logger('Invalid body.', LOGGER_DEBUG);
-			return;
-		}
-
-		self::processActivity($activity, $body, $uid);
-	}
-
-	public static function fetchOutbox($url)
+	/**
+	 * Fetches activities from the outbox of a given profile and processes it
+	 *
+	 * @param string $url
+	 * @param integer $uid User ID
+	 */
+	public static function fetchOutbox($url, $uid)
 	{
 		$data = self::fetchContent($url);
 		if (empty($data)) {
@@ -825,641 +143,15 @@ class ActivityPub
 		} elseif (!empty($data['first']['orderedItems'])) {
 			$items = $data['first']['orderedItems'];
 		} elseif (!empty($data['first'])) {
-			self::fetchOutbox($data['first']);
+			self::fetchOutbox($data['first'], $uid);
 			return;
 		} else {
 			$items = [];
 		}
 
 		foreach ($items as $activity) {
-			self::processActivity($activity);
-		}
-	}
-
-	private static function prepareObjectData($activity, $uid)
-	{
-		$actor = JsonLD::fetchElement($activity, 'actor', 'id');
-		if (empty($actor)) {
-			logger('Empty actor', LOGGER_DEBUG);
-			return [];
-		}
-
-		// Fetch all receivers from to, cc, bto and bcc
-		$receivers = self::getReceivers($activity, $actor);
-
-		// When it is a delivery to a personal inbox we add that user to the receivers
-		if (!empty($uid)) {
-			$owner = User::getOwnerDataById($uid);
-			$additional = ['uid:' . $uid => $uid];
-			$receivers = array_merge($receivers, $additional);
-		}
-
-		logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
-
-		$public = in_array(0, $receivers);
-
-		if (is_string($activity['object'])) {
-			$object_url = $activity['object'];
-		} elseif (!empty($activity['object']['id'])) {
-			$object_url = $activity['object']['id'];
-		} else {
-			logger('No object found', LOGGER_DEBUG);
-			return [];
-		}
-
-		// Fetch the content only on activities where this matters
-		if (in_array($activity['type'], ['Create', 'Update', 'Announce'])) {
-			$object_data = self::fetchObject($object_url, $activity['object']);
-			if (empty($object_data)) {
-				logger("Object data couldn't be processed", LOGGER_DEBUG);
-				return [];
-			}
-		} elseif ($activity['type'] == 'Accept') {
-			$object_data = [];
-			$object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
-			$object_data['object'] = JsonLD::fetchElement($activity, 'object', 'actor');
-		} elseif ($activity['type'] == 'Undo') {
-			$object_data = [];
-			$object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
-			$object_data['object'] = JsonLD::fetchElement($activity, 'object', 'object');
-		} elseif (in_array($activity['type'], ['Like', 'Dislike'])) {
-			// Create a mostly empty array out of the activity data (instead of the object).
-			// This way we later don't have to check for the existence of ech individual array element.
-			$object_data = self::processCommonData($activity);
-			$object_data['name'] = $activity['type'];
-			$object_data['author'] = $activity['actor'];
-			$object_data['object'] = $object_url;
-		} elseif ($activity['type'] == 'Follow') {
-			$object_data['id'] = $activity['id'];
-			$object_data['object'] = $object_url;
-		} else {
-			$object_data = [];
-		}
-
-		$object_data = self::addActivityFields($object_data, $activity);
-
-		$object_data['type'] = $activity['type'];
-		$object_data['owner'] = $actor;
-		$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
-
-		return $object_data;
-	}
-
-	private static function processActivity($activity, $body = '', $uid = null)
-	{
-		if (empty($activity['type'])) {
-			logger('Empty type', LOGGER_DEBUG);
-			return;
-		}
-
-		if (empty($activity['object'])) {
-			logger('Empty object', LOGGER_DEBUG);
-			return;
-		}
-
-		if (empty($activity['actor'])) {
-			logger('Empty actor', LOGGER_DEBUG);
-			return;
-
-		}
-
-		// Non standard
-		// title, atomUri, context_id, statusnetConversationId
-
-		// To-Do?
-		// context, location, signature;
-
-		logger('Processing activity: ' . $activity['type'], LOGGER_DEBUG);
-
-		$object_data = self::prepareObjectData($activity, $uid);
-		if (empty($object_data)) {
-			logger('No object data found', LOGGER_DEBUG);
-			return;
-		}
-
-		switch ($activity['type']) {
-			case 'Create':
-			case 'Announce':
-				self::createItem($object_data, $body);
-				break;
-
-			case 'Like':
-				self::likeItem($object_data, $body);
-				break;
-
-			case 'Dislike':
-				break;
-
-			case 'Update':
-				break;
-
-			case 'Delete':
-				break;
-
-			case 'Follow':
-				self::followUser($object_data);
-				break;
-
-			case 'Accept':
-				if ($object_data['object_type'] == 'Follow') {
-					self::acceptFollowUser($object_data);
-				}
-				break;
-
-			case 'Undo':
-				if ($object_data['object_type'] == 'Follow') {
-					self::undoFollowUser($object_data);
-				}
-				break;
-
-			default:
-				logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG);
-				break;
-		}
-	}
-
-	private static function getReceivers($activity, $actor)
-	{
-		$receivers = [];
-
-		if (!empty($actor)) {
-			$profile = self::fetchprofile($actor);
-			$followers = defaults($profile, 'followers', '');
-
-			logger('Actor: ' . $actor . ' - Followers: ' . $followers, LOGGER_DEBUG);
-		} else {
-			logger('Empty actor', LOGGER_DEBUG);
-			$followers = '';
-		}
-
-		$elements = ['to', 'cc', 'bto', 'bcc'];
-		foreach ($elements as $element) {
-			if (empty($activity[$element])) {
-				continue;
-			}
-
-			// The receiver can be an arror or a string
-			if (is_string($activity[$element])) {
-				$activity[$element] = [$activity[$element]];
-			}
-
-			foreach ($activity[$element] as $receiver) {
-				if ($receiver == self::PUBLIC) {
-					$receivers['uid:0'] = 0;
-				}
-
-				if (($receiver == self::PUBLIC) && !empty($actor)) {
-					// This will most likely catch all OStatus connections to Mastodon
-					$condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]];
-					$contacts = DBA::select('contact', ['uid'], $condition);
-					while ($contact = DBA::fetch($contacts)) {
-						if ($contact['uid'] != 0) {
-							$receivers['uid:' . $contact['uid']] = $contact['uid'];
-						}
-					}
-					DBA::close($contacts);
-				}
-
-				if (in_array($receiver, [$followers, self::PUBLIC]) && !empty($actor)) {
-					$condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
-						'network' => Protocol::ACTIVITYPUB];
-					$contacts = DBA::select('contact', ['uid'], $condition);
-					while ($contact = DBA::fetch($contacts)) {
-						if ($contact['uid'] != 0) {
-							$receivers['uid:' . $contact['uid']] = $contact['uid'];
-						}
-					}
-					DBA::close($contacts);
-					continue;
-				}
-
-				$condition = ['self' => true, 'nurl' => normalise_link($receiver)];
-				$contact = DBA::selectFirst('contact', ['uid'], $condition);
-				if (!DBA::isResult($contact)) {
-					continue;
-				}
-				$receivers['uid:' . $contact['uid']] = $contact['uid'];
-			}
-		}
-		return $receivers;
-	}
-
-	private static function addActivityFields($object_data, $activity)
-	{
-		if (!empty($activity['published']) && empty($object_data['published'])) {
-			$object_data['published'] = $activity['published'];
-		}
-
-		if (!empty($activity['updated']) && empty($object_data['updated'])) {
-			$object_data['updated'] = $activity['updated'];
-		}
-
-		if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
-			$object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
-		}
-
-		if (!empty($activity['instrument'])) {
-			$object_data['service'] = JsonLD::fetchElement($activity, 'instrument', 'name', 'type', 'Service');
-		}
-		return $object_data;
-	}
-
-	private static function fetchObject($object_url, $object = [], $public = true)
-	{
-		if ($public) {
-			$data = self::fetchContent($object_url);
-			if (empty($data)) {
-				logger('Empty content for ' . $object_url . ', check if content is available locally.', LOGGER_DEBUG);
-				$data = $object_url;
-				$data = $object;
-			}
-		} else {
-			logger('Using original object for url ' . $object_url, LOGGER_DEBUG);
-			$data = $object;
-		}
-
-		if (is_string($data)) {
-			$item = Item::selectFirst([], ['uri' => $data]);
-			if (!DBA::isResult($item)) {
-				logger('Object with url ' . $data . ' was not found locally.', LOGGER_DEBUG);
-				return false;
-			}
-			logger('Using already stored item for url ' . $object_url, LOGGER_DEBUG);
-			$data = self::createNote($item);
-		}
-
-		if (empty($data['type'])) {
-			logger('Empty type', LOGGER_DEBUG);
-			return false;
-		} else {
-			$type = $data['type'];
-			logger('Type ' . $type, LOGGER_DEBUG);
-		}
-
-		if (in_array($type, ['Note', 'Article', 'Video'])) {
-			$common = self::processCommonData($data);
-		}
-
-		switch ($type) {
-			case 'Note':
-				return array_merge($common, self::processNote($data));
-			case 'Article':
-				return array_merge($common, self::processArticle($data));
-			case 'Video':
-				return array_merge($common, self::processVideo($data));
-
-			case 'Announce':
-				if (empty($data['object'])) {
-					return false;
-				}
-				return self::fetchObject($data['object']);
-
-			case 'Person':
-			case 'Tombstone':
-				break;
-
-			default:
-				logger('Unknown object type: ' . $data['type'], LOGGER_DEBUG);
-				break;
-		}
-	}
-
-	private static function processCommonData(&$object)
-	{
-		if (empty($object['id'])) {
-			return false;
-		}
-
-		$object_data = [];
-		$object_data['type'] = $object['type'];
-		$object_data['uri'] = $object['id'];
-
-		if (!empty($object['inReplyTo'])) {
-			$object_data['reply-to-uri'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
-		} else {
-			$object_data['reply-to-uri'] = $object_data['uri'];
-		}
-
-		$object_data['published'] = defaults($object, 'published', null);
-		$object_data['updated'] = defaults($object, 'updated', $object_data['published']);
-
-		if (empty($object_data['published']) && !empty($object_data['updated'])) {
-			$object_data['published'] = $object_data['updated'];
-		}
-
-		$object_data['uuid'] = defaults($object, 'uuid', null);
-		$object_data['owner'] = $object_data['author'] = JsonLD::fetchElement($object, 'attributedTo', 'id');
-		$object_data['context'] = defaults($object, 'context', null);
-		$object_data['conversation'] = defaults($object, 'conversation', null);
-		$object_data['sensitive'] = defaults($object, 'sensitive', null);
-		$object_data['name'] = defaults($object, 'title', null);
-		$object_data['name'] = defaults($object, 'name', $object_data['name']);
-		$object_data['summary'] = defaults($object, 'summary', null);
-		$object_data['content'] = defaults($object, 'content', null);
-		$object_data['source'] = defaults($object, 'source', null);
-		$object_data['location'] = JsonLD::fetchElement($object, 'location', 'name', 'type', 'Place');
-		$object_data['attachments'] = defaults($object, 'attachment', null);
-		$object_data['tags'] = defaults($object, 'tag', null);
-		$object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service');
-		$object_data['alternate-url'] = JsonLD::fetchElement($object, 'url', 'href');
-		$object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
-
-		// Unhandled
-		// @context, type, actor, signature, mediaType, duration, replies, icon
-
-		// Also missing: (Defined in the standard, but currently unused)
-		// audience, preview, endTime, startTime, generator, image
-
-		return $object_data;
-	}
-
-	private static function processNote($object)
-	{
-		$object_data = [];
-
-		// To-Do?
-		// emoji, atomUri, inReplyToAtomUri
-
-		// Unhandled
-		// contentMap, announcement_count, announcements, context_id, likes, like_count
-		// inReplyToStatusId, shares, quoteUrl, statusnetConversationId
-
-		return $object_data;
-	}
-
-	private static function processArticle($object)
-	{
-		$object_data = [];
-
-		return $object_data;
-	}
-
-	private static function processVideo($object)
-	{
-		$object_data = [];
-
-		// To-Do?
-		// category, licence, language, commentsEnabled
-
-		// Unhandled
-		// views, waitTranscoding, state, support, subtitleLanguage
-		// likes, dislikes, shares, comments
-
-		return $object_data;
-	}
-
-	private static function convertMentions($body)
-	{
-		$URLSearchString = "^\[\]";
-		$body = preg_replace("/\[url\=([$URLSearchString]*)\]([#@!])(.*?)\[\/url\]/ism", '$2[url=$1]$3[/url]', $body);
-
-		return $body;
-	}
-
-	private static function constructTagList($tags, $sensitive)
-	{
-		if (empty($tags)) {
-			return '';
-		}
-
-		$tag_text = '';
-		foreach ($tags as $tag) {
-			if (in_array($tag['type'], ['Mention', 'Hashtag'])) {
-				if (!empty($tag_text)) {
-					$tag_text .= ',';
-				}
-
-				if (empty($tag['href'])) {
-					//$tag['href']
-					logger('Blubb!');
-				}
-
-				$tag_text .= substr($tag['name'], 0, 1) . '[url=' . $tag['href'] . ']' . substr($tag['name'], 1) . '[/url]';
-			}
-		}
-
-		/// @todo add nsfw for $sensitive
-
-		return $tag_text;
-	}
-
-	private static function constructAttachList($attachments, $item)
-	{
-		if (empty($attachments)) {
-			return $item;
-		}
-
-		foreach ($attachments as $attach) {
-			$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
-			if ($filetype == 'image') {
-				$item['body'] .= "\n[img]".$attach['url'].'[/img]';
-			} else {
-				if (!empty($item["attach"])) {
-					$item["attach"] .= ',';
-				} else {
-					$item["attach"] = '';
-				}
-				if (!isset($attach['length'])) {
-					$attach['length'] = "0";
-				}
-				$item["attach"] .= '[attach]href="'.$attach['url'].'" length="'.$attach['length'].'" type="'.$attach['mediaType'].'" title="'.defaults($attach, 'name', '').'"[/attach]';
-			}
-		}
-
-		return $item;
-	}
-
-	private static function createItem($activity, $body)
-	{
-		$item = [];
-		$item['verb'] = ACTIVITY_POST;
-		$item['parent-uri'] = $activity['reply-to-uri'];
-
-		if ($activity['reply-to-uri'] == $activity['uri']) {
-			$item['gravity'] = GRAVITY_PARENT;
-			$item['object-type'] = ACTIVITY_OBJ_NOTE;
-		} else {
-			$item['gravity'] = GRAVITY_COMMENT;
-			$item['object-type'] = ACTIVITY_OBJ_COMMENT;
-		}
-
-		if (($activity['uri'] != $activity['reply-to-uri']) && !Item::exists(['uri' => $activity['reply-to-uri']])) {
-			logger('Parent ' . $activity['reply-to-uri'] . ' not found. Try to refetch it.');
-			self::fetchMissingActivity($activity['reply-to-uri'], $activity);
-		}
-
-		self::postItem($activity, $item, $body);
-	}
-
-	private static function likeItem($activity, $body)
-	{
-		$item = [];
-		$item['verb'] = ACTIVITY_LIKE;
-		$item['parent-uri'] = $activity['object'];
-		$item['gravity'] = GRAVITY_ACTIVITY;
-		$item['object-type'] = ACTIVITY_OBJ_NOTE;
-
-		self::postItem($activity, $item, $body);
-	}
-
-	private static function postItem($activity, $item, $body)
-	{
-		/// @todo What to do with $activity['context']?
-
-		$item['network'] = Protocol::ACTIVITYPUB;
-		$item['private'] = !in_array(0, $activity['receiver']);
-		$item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
-		$item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true);
-		$item['uri'] = $activity['uri'];
-		$item['created'] = $activity['published'];
-		$item['edited'] = $activity['updated'];
-		$item['guid'] = $activity['uuid'];
-		$item['title'] = HTML::toBBCode($activity['name']);
-		$item['content-warning'] = HTML::toBBCode($activity['summary']);
-		$item['body'] = self::convertMentions(HTML::toBBCode($activity['content']));
-		$item['location'] = $activity['location'];
-		$item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
-		$item['app'] = $activity['service'];
-		$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
-
-		$item = self::constructAttachList($activity['attachments'], $item);
-
-		$source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
-		if (!empty($source)) {
-			$item['body'] = $source;
-		}
-
-		$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
-		$item['source'] = $body;
-		$item['conversation-uri'] = $activity['conversation'];
-
-		foreach ($activity['receiver'] as $receiver) {
-			$item['uid'] = $receiver;
-			$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
-
-			if (($receiver != 0) && empty($item['contact-id'])) {
-				$item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);
-			}
-
-			$item_id = Item::insert($item);
-			logger('Storing for user ' . $item['uid'] . ': ' . $item_id);
-		}
-	}
-
-	private static function fetchMissingActivity($url, $child)
-	{
-		$object = ActivityPub::fetchContent($url);
-		if (empty($object)) {
-			logger('Activity ' . $url . ' was not fetchable, aborting.');
-			return;
-		}
-
-		$activity = [];
-		$activity['@context'] = $object['@context'];
-		unset($object['@context']);
-		$activity['id'] = $object['id'];
-		$activity['to'] = defaults($object, 'to', []);
-		$activity['cc'] = defaults($object, 'cc', []);
-		$activity['actor'] = $child['author'];
-		$activity['object'] = $object;
-		$activity['published'] = $object['published'];
-		$activity['type'] = 'Create';
-		self::processActivity($activity);
-		logger('Activity ' . $url . ' had been fetched and processed.');
-	}
-
-	private static function getUserOfObject($object)
-	{
-		$self = DBA::selectFirst('contact', ['uid'], ['nurl' => normalise_link($object), 'self' => true]);
-		if (!DBA::isResult($self)) {
-			return false;
-		} else {
-			return $self['uid'];
-		}
-	}
-
-	private static function followUser($activity)
-	{
-		$uid = self::getUserOfObject($activity['object']);
-		if (empty($uid)) {
-			return;
-		}
-
-		$owner = User::getOwnerDataById($uid);
-
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
-		if (!empty($cid)) {
-			$contact = DBA::selectFirst('contact', [], ['id' => $cid]);
-		} else {
-			$contact = false;
-		}
-
-		$item = ['author-id' => Contact::getIdForURL($activity['owner']),
-			'author-link' => $activity['owner']];
-
-		Contact::addRelationship($owner, $contact, $item);
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
-		if (empty($cid)) {
-			return;
-		}
-
-		$contact = DBA::selectFirst('contact', ['network'], ['id' => $cid]);
-		if ($contact['network'] != Protocol::ACTIVITYPUB) {
-			Contact::updateFromProbe($cid, Protocol::ACTIVITYPUB);
-		}
-
-		DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]);
-		logger('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
-	}
-
-	private static function acceptFollowUser($activity)
-	{
-		$uid = self::getUserOfObject($activity['object']);
-		if (empty($uid)) {
-			return;
-		}
-
-		$owner = User::getOwnerDataById($uid);
-
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
-		if (empty($cid)) {
-			logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
-			return;
-		}
-
-		$fields = ['pending' => false];
-
-		$contact = DBA::selectFirst('contact', ['rel'], ['id' => $cid]);
-		if ($contact['rel'] == Contact::FOLLOWER) {
-			$fields['rel'] = Contact::FRIEND;
-		}
-
-		$condition = ['id' => $cid];
-		DBA::update('contact', $fields, $condition);
-		logger('Accept contact request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
-	}
-
-	private static function undoFollowUser($activity)
-	{
-		$uid = self::getUserOfObject($activity['object']);
-		if (empty($uid)) {
-			return;
+			$ldactivity = JsonLD::compact($activity);
+			ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
 		}
-
-		$owner = User::getOwnerDataById($uid);
-
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
-		if (empty($cid)) {
-			logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
-			return;
-		}
-
-		$contact = DBA::selectFirst('contact', [], ['id' => $cid]);
-		if (!DBA::isResult($contact)) {
-			return;
-		}
-
-		Contact::removeFollower($owner, $contact);
-		logger('Undo following request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
 	}
 }