X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=fa8bdc0439d997ec5009e95b76fa20f6691c311a;hb=5d43d521d3237cc5a39f066becdabbc36f40d123;hp=22c8a3518e3520bef551897b96569663f2e7642b;hpb=42a3610a796b31c9956cb650d3b13075e241b26f;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 22c8a3518e..fa8bdc0439 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -21,15 +21,14 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
 use Friendica\Model\Profile;
-use Friendica\Core\Config;
 use Friendica\Object\Image;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\Diaspora;
 use Friendica\Core\Cache;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
 
 require_once 'include/api.php';
+require_once 'mod/share.php';
 
 /**
  * @brief ActivityPub Transmitter Protocol class
@@ -42,15 +41,16 @@ class Transmitter
 	/**
 	 * collects the lost of followers of the given owner
 	 *
-	 * @param array $owner Owner array
-	 * @param integer $page Page number
+	 * @param array   $owner Owner array
+	 * @param integer $page  Page number
 	 *
 	 * @return array of owners
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getFollowers($owner, $page = null)
 	{
 		$condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
-			'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+			'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
 		$count = DBA::count('contact', $condition);
 
 		$data = ['@context' => ActivityPub::CONTEXT];
@@ -89,15 +89,16 @@ class Transmitter
 	/**
 	 * Create list of following contacts
 	 *
-	 * @param array $owner Owner array
-	 * @param integer $page Page numbe
+	 * @param array   $owner Owner array
+	 * @param integer $page  Page numbe
 	 *
 	 * @return array of following contacts
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getFollowing($owner, $page = null)
 	{
 		$condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
-			'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+			'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
 		$count = DBA::count('contact', $condition);
 
 		$data = ['@context' => ActivityPub::CONTEXT];
@@ -136,10 +137,12 @@ class Transmitter
 	/**
 	 * Public posts for the given owner
 	 *
-	 * @param array $owner Owner array
-	 * @param integer $page Page numbe
+	 * @param array   $owner Owner array
+	 * @param integer $page  Page numbe
 	 *
 	 * @return array of posts
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getOutbox($owner, $page = null)
 	{
@@ -186,6 +189,7 @@ class Transmitter
 	 *
 	 * @param integer $uid User ID
 	 * @return array with profile data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getProfile($uid)
 	{
@@ -228,7 +232,7 @@ class Transmitter
 			'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
 		$data['summary'] = $contact['about'];
 		$data['url'] = $contact['url'];
-		$data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP]);
+		$data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
 		$data['publicKey'] = ['id' => $contact['url'] . '#main-key',
 			'owner' => $contact['url'],
 			'publicKeyPem' => $user['pubkey']];
@@ -246,6 +250,8 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array with permissions
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchPermissionBlockFromConversation($item)
 	{
@@ -295,13 +301,30 @@ class Transmitter
 	/**
 	 * Creates an array of permissions from an item thread
 	 *
-	 * @param array $item
+	 * @param array   $item
 	 * @param boolean $blindcopy
+	 * @param boolean $last_id
 	 *
 	 * @return array with permission data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	private static function createPermissionBlockForItem($item, $blindcopy)
+	private static function createPermissionBlockForItem($item, $blindcopy, $last_id = 0)
 	{
+		if ($last_id == 0) {
+			$last_id = $item['id'];
+		}
+
+		$always_bcc = false;
+
+		// Check if we should always deliver our stuff via BCC
+		if (!empty($item['uid'])) {
+			$profile = Profile::getByUID($item['uid']);
+			if (!empty($profile)) {
+				$always_bcc = $profile['hide-friends'];
+			}
+		}
+
 		// Will be activated in a later step
 		// $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
 
@@ -310,7 +333,11 @@ class Transmitter
 
 		$data = ['to' => [], 'cc' => [], 'bcc' => []];
 
-		$actor_profile = APContact::getByURL($item['author-link']);
+		if ($item['gravity'] == GRAVITY_PARENT) {
+			$actor_profile = APContact::getByURL($item['owner-link']);
+		} else {
+			$actor_profile = APContact::getByURL($item['author-link']);
+		}
 
 		$terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
 
@@ -318,9 +345,6 @@ class Transmitter
 			$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
 
 			$data['to'][] = ActivityPub::PUBLIC_COLLECTION;
-			if (!empty($actor_profile['followers'])) {
-				$data['cc'][] = $actor_profile['followers'];
-			}
 
 			foreach ($terms as $term) {
 				$profile = APContact::getByURL($term['url'], false);
@@ -331,8 +355,6 @@ class Transmitter
 		} else {
 			$receiver_list = Item::enumeratePermissions($item);
 
-			$mentioned = [];
-
 			foreach ($terms as $term) {
 				$cid = Contact::getIdForURL($term['url'], $item['uid']);
 				if (!empty($cid) && in_array($cid, $receiver_list)) {
@@ -344,39 +366,55 @@ class Transmitter
 			}
 
 			foreach ($receiver_list as $receiver) {
-				$contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => $networks]);
+				$contact = DBA::selectFirst('contact', ['url', 'hidden'], ['id' => $receiver, 'network' => $networks]);
 				if (DBA::isResult($contact) && !empty($profile = APContact::getByURL($contact['url'], false))) {
-					// BCC is currently deactivated, due to Pleroma and Mastodon not reacting like expected
-					// $data['bcc'][] = $profile['url'];
-					$data['cc'][] = $profile['url'];
+					if ($contact['hidden'] || $always_bcc) {
+						$data['bcc'][] = $profile['url'];
+					} else {
+						$data['cc'][] = $profile['url'];
+					}
 				}
 			}
 		}
 
 		$parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
 		while ($parent = Item::fetch($parents)) {
+			if ($parent['gravity'] == GRAVITY_PARENT) {
+				$profile = APContact::getByURL($parent['owner-link'], false);
+				if (!empty($profile)) {
+					if ($item['gravity'] != GRAVITY_PARENT) {
+						// Comments to forums are directed to the forum
+						// But comments to forums aren't directed to the followers collection
+						if ($profile['type'] == 'Group') {
+							$data['to'][] = $profile['url'];
+						} else {
+							$data['cc'][] = $profile['url'];
+							if (!$item['private']) {
+								$data['cc'][] = $actor_profile['followers'];
+							}
+						}
+					} else {
+						// Public thread parent post always are directed to the followes
+						if (!$item['private']) {
+							$data['cc'][] = $actor_profile['followers'];
+						}
+					}
+				}
+			}
+
 			// Don't include data from future posts
-			if ($parent['id'] >= $item['id']) {
+			if ($parent['id'] >= $last_id) {
 				continue;
 			}
 
 			$profile = APContact::getByURL($parent['author-link'], false);
 			if (!empty($profile)) {
-				if ($parent['uri'] == $item['thr-parent']) {
+				if (($profile['type'] == 'Group') || ($parent['uri'] == $item['thr-parent'])) {
 					$data['to'][] = $profile['url'];
 				} else {
 					$data['cc'][] = $profile['url'];
 				}
 			}
-
-			if ($item['gravity'] != GRAVITY_PARENT) {
-				continue;
-			}
-
-			$profile = APContact::getByURL($parent['owner-link'], false);
-			if (!empty($profile)) {
-				$data['cc'][] = $profile['url'];
-			}
 		}
 		DBA::close($parents);
 
@@ -424,10 +462,12 @@ class Transmitter
 	/**
 	 * Fetches a list of inboxes of followers of a given user
 	 *
-	 * @param integer $uid User ID
+	 * @param integer $uid      User ID
 	 * @param boolean $personal fetch personal inboxes
 	 *
 	 * @return array of follower inboxes
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fetchTargetInboxesforUser($uid, $personal = false)
 	{
@@ -469,15 +509,18 @@ class Transmitter
 	/**
 	 * Fetches an array of inboxes for the given item and user
 	 *
-	 * @param array $item
-	 * @param integer $uid User ID
+	 * @param array   $item
+	 * @param integer $uid      User ID
 	 * @param boolean $personal fetch personal inboxes
+	 * @param integer $last_id Last item id for adding receivers
 	 *
 	 * @return array with inboxes
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	public static function fetchTargetInboxes($item, $uid, $personal = false)
+	public static function fetchTargetInboxes($item, $uid, $personal = false, $last_id = 0)
 	{
-		$permissions = self::createPermissionBlockForItem($item, true);
+		$permissions = self::createPermissionBlockForItem($item, true, $last_id);
 		if (empty($permissions)) {
 			return [];
 		}
@@ -527,10 +570,20 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return string with activity type
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function getTypeOfItem($item)
 	{
-		if (!empty(Diaspora::isReshare($item['body'], false))) {
+		$reshared = false;
+
+		// Only check for a reshare, if it is a real reshare and no quoted reshare
+		if (strpos($item['body'], "[share") === 0) {
+			$announce = api_share_as_retweet($item);
+			$reshared = !empty($announce['plink']);
+		}
+
+		if ($reshared) {
 			$type = 'Announce';
 		} elseif ($item['verb'] == ACTIVITY_POST) {
 			if ($item['created'] == $item['edited']) {
@@ -548,6 +601,8 @@ class Transmitter
 			$type = 'Reject';
 		} elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
 			$type = 'TentativeAccept';
+		} elseif ($item['verb'] == ACTIVITY_FOLLOW) {
+			$type = 'Follow';
 		} else {
 			$type = '';
 		}
@@ -559,9 +614,10 @@ class Transmitter
 	 * Creates the activity or fetches it from the cache
 	 *
 	 * @param integer $item_id
-	 * @param boolean $force   Force new cache entry
+	 * @param boolean $force Force new cache entry
 	 *
 	 * @return array with the activity
+	 * @throws \Exception
 	 */
 	public static function createCachedActivityFromItem($item_id, $force = false)
 	{
@@ -587,6 +643,7 @@ class Transmitter
 	 * @param boolean $object_mode Is the activity item is used inside another object?
 	 *
 	 * @return array of activity
+	 * @throws \Exception
 	 */
 	public static function createActivityFromItem($item_id, $object_mode = false)
 	{
@@ -596,16 +653,29 @@ class Transmitter
 			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;
+		if ($item['wall']) {
+			$owner = User::getOwnerDataById($item['uid']);
+			if (($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) && ($item['author-link'] != $owner['url'])) {
+				$type = 'Announce';
+
+				// Disguise forum posts as reshares. Will later be converted to a real announce
+				$item['body'] = share_header($item['author-name'], $item['author-link'], $item['author-avatar'],
+					$item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]';
 			}
 		}
 
-		$type = self::getTypeOfItem($item);
+		if (empty($type)) {
+			$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;
+				}
+			}
+
+			$type = self::getTypeOfItem($item);
+		}
 
 		if (!$object_mode) {
 			$data = ['@context' => ActivityPub::CONTEXT];
@@ -632,7 +702,9 @@ class Transmitter
 		if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
 			$data['object'] = self::createNote($item);
 		} elseif ($data['type'] == 'Announce') {
-			$data['object'] = self::createAnnounce($item);
+			$data = self::createAnnounce($item, $data);
+		} elseif ($data['type'] == 'Follow') {
+			$data['object'] = $item['parent-uri'];
 		} elseif ($data['type'] == 'Undo') {
 			$data['object'] = self::createActivityFromItem($item_id, true);
 		} else {
@@ -643,9 +715,15 @@ class Transmitter
 			$data['object'] = $item['thr-parent'];
 		}
 
-		$owner = User::getOwnerDataById($item['uid']);
+		if (!empty($item['contact-uid'])) {
+			$uid = $item['contact-uid'];
+		} else {
+			$uid = $item['uid'];
+		}
+
+		$owner = User::getOwnerDataById($uid);
 
-		if (!$object_mode) {
+		if (!$object_mode && !empty($owner)) {
 			return LDSignature::sign($data, $owner);
 		} else {
 			return $data;
@@ -660,6 +738,8 @@ class Transmitter
 	 * @param integer $item_id
 	 *
 	 * @return array with the object data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createObjectFromItemID($item_id)
 	{
@@ -715,6 +795,7 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array of tags
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function createTagList($item)
 	{
@@ -723,7 +804,8 @@ class Transmitter
 		$terms = Term::tagArrayFromItemId($item['id']);
 		foreach ($terms as $term) {
 			if ($term['type'] == TERM_HASHTAG) {
-				$tags[] = ['type' => 'Hashtag', 'href' => $term['url'], 'name' => '#' . $term['term']];
+				$url = System::baseUrl() . '/search?tag=' . urlencode($term['term']);
+				$tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['term']];
 			} elseif ($term['type'] == TERM_MENTION) {
 				$contact = Contact::getDetailsByURL($term['url']);
 				if (!empty($contact['addr'])) {
@@ -741,10 +823,11 @@ class Transmitter
 	/**
 	 * Adds attachment data to the JSON document
 	 *
-	 * @param array $item Data of the item that is to be posted
-	 * @param text $type Object type
+	 * @param array  $item Data of the item that is to be posted
+	 * @param string $type Object type
 	 *
 	 * @return array with attachment data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function createAttachmentList($item, $type)
 	{
@@ -793,11 +876,12 @@ class Transmitter
 		return $attachments;
 	}
 
-        /**
+	/**
 	 * @brief Callback function to replace a Friendica style mention in a mention that is used on AP
 	 *
 	 * @param array $match Matching values for the callback
 	 * @return string Replaced mention
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function mentionCallback($match)
 	{
@@ -837,6 +921,7 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return string with context url
+	 * @throws \Exception
 	 */
 	private static function fetchContextURLForItem($item)
 	{
@@ -857,6 +942,7 @@ class Transmitter
 	 * @param integer $item_id
 	 *
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	private static function isSensitive($item_id)
 	{
@@ -870,6 +956,7 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array with the event data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function createEvent($item)
 	{
@@ -896,6 +983,8 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array with the object data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createNote($item)
 	{
@@ -984,27 +1073,65 @@ class Transmitter
 	 * Creates an announce object entry
 	 *
 	 * @param array $item
+	 * @param array $data activity data
 	 *
-	 * @return string with announced object url
+	 * @return array with activity data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	public static function createAnnounce($item)
+	private static function createAnnounce($item, $data)
 	{
 		$announce = api_share_as_retweet($item);
 		if (empty($announce['plink'])) {
-			return self::createNote($item);
+			$data['type'] = 'Create';
+			$data['object'] = self::createNote($item);
+			return $data;
 		}
 
-		return $announce['plink'];
+		// Fetch the original id of the object
+		$activity = ActivityPub::fetchContent($announce['plink'], $item['uid']);
+		if (!empty($activity)) {
+			$ldactivity = JsonLD::compact($activity);
+			$id = JsonLD::fetchElement($ldactivity, '@id');
+			if (!empty($id)) {
+				$data['object'] = $id;
+				return $data;
+			}
+		}
+
+		$data['type'] = 'Create';
+		$data['object'] = self::createNote($item);
+		return $data;
+	}
+
+	/**
+	 * Creates an activity id for a given contact id
+	 *
+	 * @param integer $cid Contact ID of target
+	 *
+	 * @return bool|string activity id
+	 */
+	public static function activityIDFromContact($cid)
+	{
+		$contact = DBA::selectFirst('contact', ['uid', 'id', 'created'], ['id' => $cid]);
+		if (!DBA::isResult($contact)) {
+			return false;
+		}
+
+		$hash = hash('ripemd128', $contact['uid'].'-'.$contact['id'].'-'.$contact['created']);
+		$uuid = substr($hash, 0, 8). '-' . substr($hash, 8, 4) . '-' . substr($hash, 12, 4) . '-' . substr($hash, 16, 4) . '-' . substr($hash, 20, 12);
+		return System::baseUrl() . '/activity/' . $uuid;
 	}
 
 	/**
 	 * Transmits a contact suggestion to a given inbox
 	 *
-	 * @param integer $uid User ID
-	 * @param string $inbox Target inbox
+	 * @param integer $uid           User ID
+	 * @param string  $inbox         Target inbox
 	 * @param integer $suggestion_id Suggestion ID
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sendContactSuggestion($uid, $inbox, $suggestion_id)
 	{
@@ -1031,10 +1158,11 @@ class Transmitter
 	/**
 	 * Transmits a profile relocation to a given inbox
 	 *
-	 * @param integer $uid User ID
-	 * @param string $inbox Target inbox
+	 * @param integer $uid   User ID
+	 * @param string  $inbox Target inbox
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sendProfileRelocation($uid, $inbox)
 	{
@@ -1059,10 +1187,11 @@ class Transmitter
 	/**
 	 * Transmits a profile deletion to a given inbox
 	 *
-	 * @param integer $uid User ID
-	 * @param string $inbox Target inbox
+	 * @param integer $uid   User ID
+	 * @param string  $inbox Target inbox
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sendProfileDeletion($uid, $inbox)
 	{
@@ -1087,10 +1216,12 @@ class Transmitter
 	/**
 	 * Transmits a profile change to a given inbox
 	 *
-	 * @param integer $uid User ID
-	 * @param string $inbox Target inbox
+	 * @param integer $uid   User ID
+	 * @param string  $inbox Target inbox
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendProfileUpdate($uid, $inbox)
 	{
@@ -1116,36 +1247,78 @@ class Transmitter
 	/**
 	 * Transmits a given activity to a target
 	 *
-	 * @param array $activity
-	 * @param string $target Target profile
-	 * @param integer $uid User ID
+	 * @param string  $activity Type name
+	 * @param string  $target   Target profile
+	 * @param integer $uid      User ID
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @throws \Exception
 	 */
-	public static function sendActivity($activity, $target, $uid)
+	public static function sendActivity($activity, $target, $uid, $id = '')
 	{
 		$profile = APContact::getByURL($target);
 
 		$owner = User::getOwnerDataById($uid);
 
+		if (empty($id)) {
+			$id = System::baseUrl() . '/activity/' . System::createGUID();
+		}
+
 		$data = ['@context' => ActivityPub::CONTEXT,
-			'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+			'id' => $id,
 			'type' => $activity,
 			'actor' => $owner['url'],
 			'object' => $profile['url'],
 			'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-			'to' => $profile['url']];
+			'to' => [$profile['url']]];
 
 		Logger::log('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, Logger::DEBUG);
 
 		$signed = LDSignature::sign($data, $owner);
-		HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+		return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+	}
+
+	/**
+	 * Transmits a "follow object" activity to a target
+	 * This is a preparation for sending automated "follow" requests when receiving "Announce" messages
+	 *
+	 * @param string  $object Object URL
+	 * @param string  $target Target profile
+	 * @param integer $uid    User ID
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @throws \Exception
+	 */
+	public static function sendFollowObject($object, $target, $uid)
+	{
+		$profile = APContact::getByURL($target);
+
+		$owner = User::getOwnerDataById($uid);
+
+		$data = ['@context' => ActivityPub::CONTEXT,
+			'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+			'type' => 'Follow',
+			'actor' => $owner['url'],
+			'object' => $object,
+			'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
+			'to' => [$profile['url']]];
+
+		Logger::log('Sending follow ' . $object . ' to ' . $target . ' for user ' . $uid, Logger::DEBUG);
+
+		$signed = LDSignature::sign($data, $owner);
+		return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
 	}
 
 	/**
 	 * Transmit a message that the contact request had been accepted
 	 *
-	 * @param string $target Target profile
-	 * @param $id
-	 * @param integer $uid User ID
+	 * @param string  $target Target profile
+	 * @param         $id
+	 * @param integer $uid    User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendContactAccept($target, $id, $uid)
 	{
@@ -1160,7 +1333,7 @@ class Transmitter
 				'actor' => $profile['url'],
 				'object' => $owner['url']],
 			'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-			'to' => $profile['url']];
+			'to' => [$profile['url']]];
 
 		Logger::log('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
 
@@ -1171,9 +1344,11 @@ class Transmitter
 	/**
 	 * Reject a contact request or terminates the contact relation
 	 *
-	 * @param string $target Target profile
-	 * @param $id
-	 * @param integer $uid User ID
+	 * @param string  $target Target profile
+	 * @param         $id
+	 * @param integer $uid    User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendContactReject($target, $id, $uid)
 	{
@@ -1188,7 +1363,7 @@ class Transmitter
 				'actor' => $profile['url'],
 				'object' => $owner['url']],
 			'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-			'to' => $profile['url']];
+			'to' => [$profile['url']]];
 
 		Logger::log('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
 
@@ -1199,13 +1374,21 @@ class Transmitter
 	/**
 	 * Transmits a message that we don't want to follow this contact anymore
 	 *
-	 * @param string $target Target profile
-	 * @param integer $uid User ID
+	 * @param string  $target Target profile
+	 * @param integer $uid    User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @throws \Exception
 	 */
-	public static function sendContactUndo($target, $uid)
+	public static function sendContactUndo($target, $cid, $uid)
 	{
 		$profile = APContact::getByURL($target);
 
+		$object_id = self::activityIDFromContact($cid);
+		if (empty($object_id)) {
+			return;
+		}
+
 		$id = System::baseUrl() . '/activity/' . System::createGUID();
 
 		$owner = User::getOwnerDataById($uid);
@@ -1213,11 +1396,11 @@ class Transmitter
 			'id' => $id,
 			'type' => 'Undo',
 			'actor' => $owner['url'],
-			'object' => ['id' => $id, 'type' => 'Follow',
+			'object' => ['id' => $object_id, 'type' => 'Follow',
 				'actor' => $owner['url'],
 				'object' => $profile['url']],
 			'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-			'to' => $profile['url']];
+			'to' => [$profile['url']]];
 
 		Logger::log('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);