X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=7d9d6626ce8d918132d945f0b2e24b2c363fdc17;hb=6b374c32a2b05bf65311ac704ef1b6db3ea85834;hp=3700e6f9fb8d1bfada6722e72b1baa1b30ca40ad;hpb=743e7d3ecb4bc06999284bffd977265abc23731f;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 3700e6f9fb..7d9d6626ce 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -22,26 +22,27 @@ use Friendica\Model\Profile;
 use Friendica\Core\Config;
 use Friendica\Object\Image;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Core\Cache;
 
 /**
  * @brief ActivityPub Transmitter Protocol class
  *
  * To-Do:
+ *
+ * Missing object types:
  * - Event
  *
- * Complicated:
+ * Complicated object types:
  * - Announce
  * - Undo Announce
  *
  * General:
  * - Queueing unsucessful deliveries
- * - Type "note": Remove inline images and add them as attachments
- * - Type "article": Leave imaged embedded and don't add them as attachments
  */
 class Transmitter
 {
 	/**
-	 * @brief collects the lost of followers of the given owner
+	 * collects the lost of followers of the given owner
 	 *
 	 * @param array $owner Owner array
 	 * @param integer $page Page number
@@ -88,7 +89,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Create list of following contacts
+	 * Create list of following contacts
 	 *
 	 * @param array $owner Owner array
 	 * @param integer $page Page numbe
@@ -135,7 +136,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Public posts for the given owner
+	 * Public posts for the given owner
 	 *
 	 * @param array $owner Owner array
 	 * @param integer $page Page numbe
@@ -237,7 +238,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Returns an array with permissions of a given item array
+	 * Returns an array with permissions of a given item array
 	 *
 	 * @param array $item
 	 *
@@ -290,7 +291,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Creates an array of permissions from an item thread
+	 * Creates an array of permissions from an item thread
 	 *
 	 * @param array $item
 	 *
@@ -378,7 +379,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Fetches a list of inboxes of followers of a given user
+	 * Fetches a list of inboxes of followers of a given user
 	 *
 	 * @param integer $uid User ID
 	 *
@@ -405,7 +406,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Fetches an array of inboxes for the given item and user
+	 * Fetches an array of inboxes for the given item and user
 	 *
 	 * @param array $item
 	 * @param integer $uid User ID
@@ -449,7 +450,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Returns the activity type of a given item
+	 * Returns the activity type of a given item
 	 *
 	 * @param array $item
 	 *
@@ -481,7 +482,28 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Creates an activity array for a given item id
+	 * Creates the activity or fetches it from the cache
+	 *
+	 * @param integer $item_id
+	 *
+	 * @return array with the activity
+	 */
+	public static function createCachedActivityFromItem($item_id)
+	{
+		$cachekey = 'APDelivery:createActivity:' . $item_id;
+		$data = Cache::get($cachekey);
+		if (!is_null($data)) {
+			return $data;
+		}
+
+		$data = ActivityPub\Transmitter::createActivityFromItem($item_id);
+
+		Cache::set($cachekey, $data, CACHE_QUARTER_HOUR);
+		return $data;
+	}
+
+	/**
+	 * Creates an activity array for a given item id
 	 *
 	 * @param integer $item_id
 	 * @param boolean $object_mode Is the activity item is used inside another object?
@@ -521,15 +543,9 @@ class Transmitter
 
 		$data['id'] = $item['uri'] . '#' . $type;
 		$data['type'] = $type;
-		$data['actor'] = $item['author-link'];
+		$data['actor'] = $item['owner-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['context'] = self::fetchContextURLForItem($item);
+		$data['published'] = DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM);
 
 		$data = array_merge($data, self::createPermissionBlockForItem($item));
 
@@ -553,7 +569,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Creates an object array for a given item id
+	 * Creates an object array for a given item id
 	 *
 	 * @param integer $item_id
 	 *
@@ -574,7 +590,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Returns a tag array for a given item array
+	 * Returns a tag array for a given item array
 	 *
 	 * @param array $item
 	 *
@@ -603,13 +619,13 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Adds attachment data to the JSON document
+	 * Adds attachment data to the JSON document
 	 *
 	 * @param array $item Data of the item that is to be posted
 	 * @param text $type Object type
+	 *
 	 * @return array with attachment data
 	 */
-
 	private static function createAttachmentList($item, $type)
 	{
 		$attachments = [];
@@ -638,26 +654,45 @@ class Transmitter
 			return $attachments;
 		}
 
-		/// @todo Replace this with a function that takes all pictures from the post
-		$siteinfo = BBCode::getAttachedData($item['body']);
+		// Simplify image codes
+		$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $item['body']);
 
-		if (!empty($siteinfo['image']) &&
-			(($siteinfo['type'] == 'photo') ||
-			!Config::get('system', 'ostatus_not_attach_preview'))) {
-				$imgdata = Image::getInfoFromURL($siteinfo['image']);
+		// Grab all pictures and create attachments out of them
+		if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) {
+			foreach ($pictures[1] as $picture) {
+				$imgdata = Image::getInfoFromURL($picture);
 				if ($imgdata) {
 					$attachments[] = ['type' => 'Document',
-							'mediaType' => $imgdata['mime'],
-							'url' => $siteinfo['image'],
-							'name' => null];
+						'mediaType' => $imgdata['mime'],
+						'url' => $picture,
+						'name' => null];
 				}
+			}
 		}
 
 		return $attachments;
 	}
 
 	/**
-	 * @brief Fetches the "context" value for a givem item array from the "conversation" table
+	 * Remove image elements and replaces them with links to the image
+	 *
+	 * @param string $body
+	 *
+	 * @return string with replaced elements
+	 */
+	private static function removePictures($body)
+	{
+		// Simplify image codes
+		$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
+
+		$body = preg_replace("/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi", '[url]$1[/url]', $body);
+		$body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '[url]$1[/url]', $body);
+
+		return $body;
+	}
+
+	/**
+	 * Fetches the "context" value for a givem item array from the "conversation" table
 	 *
 	 * @param array $item
 	 *
@@ -676,6 +711,13 @@ class Transmitter
 		return $context_uri;
 	}
 
+	/**
+	 * Returns if the post contains sensitive content ("nsfw")
+	 *
+	 * @param integer $item_id
+	 *
+	 * @return boolean
+	 */
 	private static function isSensitive($item_id)
 	{
 		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $item_id, 'type' => TERM_HASHTAG, 'term' => 'nsfw'];
@@ -683,7 +725,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Creates a note/article object array
+	 * Creates a note/article object array
 	 *
 	 * @param array $item
 	 *
@@ -718,10 +760,10 @@ class Transmitter
 		}
 
 		$data['diaspora:guid'] = $item['guid'];
-		$data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
+		$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);
+		if ($item['created'] != $item['edited']) {
+			$data['updated'] = DateTimeFormat::utc($item['edited'] . '+00:00', DateTimeFormat::ATOM);
 		}
 
 		$data['url'] = $item['plink'];
@@ -734,7 +776,13 @@ class Transmitter
 			$data['name'] = BBCode::convert($item['title'], false, 7);
 		}
 
-		$data['content'] = BBCode::convert($item['body'], false, 7);
+		$body = $item['body'];
+
+		if ($type == 'Note') {
+			$body = self::removePictures($body);
+		}
+
+		$data['content'] = BBCode::convert($body, false, 7);
 		$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
 
 		if (!empty($item['signed_text']) && ($item['uri'] != $item['thr-parent'])) {
@@ -749,7 +797,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Transmits a profile deletion to a given inbox
+	 * Transmits a profile deletion to a given inbox
 	 *
 	 * @param integer $uid User ID
 	 * @param string $inbox Target inbox
@@ -770,12 +818,12 @@ class Transmitter
 
 		$signed = LDSignature::sign($data, $owner);
 
-		logger('Deliver profile deletion for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+		logger('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', LOGGER_DEBUG);
 		HTTPSignature::transmit($signed, $inbox, $uid);
 	}
 
 	/**
-	 * @brief Transmits a profile change to a given inbox
+	 * Transmits a profile change to a given inbox
 	 *
 	 * @param integer $uid User ID
 	 * @param string $inbox Target inbox
@@ -796,12 +844,12 @@ class Transmitter
 
 		$signed = LDSignature::sign($data, $owner);
 
-		logger('Deliver profile update for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+		logger('Deliver profile update for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', LOGGER_DEBUG);
 		HTTPSignature::transmit($signed, $inbox, $uid);
 	}
 
 	/**
-	 * @brief Transmits a given activity to a target
+	 * Transmits a given activity to a target
 	 *
 	 * @param array $activity
 	 * @param string $target Target profile
@@ -827,7 +875,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief Transmit a message that the contact request had been accepted
+	 * Transmit a message that the contact request had been accepted
 	 *
 	 * @param string $target Target profile
 	 * @param $id
@@ -854,7 +902,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief 
+	 * Reject a contact request or terminates the contact relation
 	 *
 	 * @param string $target Target profile
 	 * @param $id
@@ -881,7 +929,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief 
+	 * Transmits a message that we don't want to follow this contact anymore
 	 *
 	 * @param string $target Target profile
 	 * @param integer $uid User ID