X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=bfbd9f9b4e05d28be5eb0de2564f0d08592f235a;hb=be7bd106784ad4e45833b1649e8409ef48f0d19f;hp=76c233fd5ecc09e3b20f6cda61d3894e5e79237e;hpb=221e1976583ef7e0e514f24433250f1ba4d8d011;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 76c233fd5e..bfbd9f9b4e 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -6,7 +6,6 @@ namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\Database\DBA;
 use Friendica\Core\System;
-use Friendica\BaseObject;
 use Friendica\Util\HTTPSignature;
 use Friendica\Core\Protocol;
 use Friendica\Model\Conversation;
@@ -19,18 +18,20 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Content\Text\BBCode;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
-use Friendica\Protocol\ActivityPub;
 use Friendica\Model\Profile;
 use Friendica\Core\Config;
 use Friendica\Object\Image;
+use Friendica\Protocol\ActivityPub;
 
 /**
  * @brief ActivityPub Transmitter Protocol class
  *
  * To-Do:
+ *
+ * Missing object types:
  * - Event
  *
- * Complicated:
+ * Complicated object types:
  * - Announce
  * - Undo Announce
  *
@@ -185,7 +186,7 @@ class Transmitter
 	 * Return the ActivityPub profile of the given user
 	 *
 	 * @param integer $uid User ID
-	 * @return profile array
+	 * @return array with profile data
 	 */
 	public static function getProfile($uid)
 	{
@@ -293,7 +294,7 @@ class Transmitter
 	 *
 	 * @param array $item
 	 *
-	 * @return permission array
+	 * @return array with permission data
 	 */
 	private static function createPermissionBlockForItem($item)
 	{
@@ -452,7 +453,7 @@ class Transmitter
 	 *
 	 * @param array $item
 	 *
-	 * @return activity type
+	 * @return string with activity type
 	 */
 	private static function getTypeOfItem($item)
 	{
@@ -520,15 +521,9 @@ class Transmitter
 
 		$data['id'] = $item['uri'] . '#' . $type;
 		$data['type'] = $type;
-		$data['actor'] = $item['author-link'];
-
-		$data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
+		$data['actor'] = $item['owner-link'];
 
-		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));
 
@@ -547,6 +542,8 @@ class Transmitter
 		} else {
 			return $data;
 		}
+
+		/// @todo Create "conversation" entry
 	}
 
 	/**
@@ -554,7 +551,7 @@ class Transmitter
 	 *
 	 * @param integer $item_id
 	 *
-	 * @return object array
+	 * @return array with the object data
 	 */
 	public static function createObjectFromItemID($item_id)
 	{
@@ -603,47 +600,14 @@ class Transmitter
 	 * @brief Adds attachment data to the JSON document
 	 *
 	 * @param array $item Data of the item that is to be posted
-	 * @return attachment array
+	 * @param text $type Object type
+	 *
+	 * @return array with attachment data
 	 */
-
-	private static function createAttachmentList($item)
+	private static function createAttachmentList($item, $type)
 	{
 		$attachments = [];
 
-		$siteinfo = BBCode::getAttachedData($item['body']);
-
-		switch ($siteinfo['type']) {
-			case 'photo':
-				if (!empty($siteinfo['image'])) {
-					$imgdata = Image::getInfoFromURL($siteinfo['image']);
-					if ($imgdata) {
-						$attachments[] = ['type' => 'Document',
-								'mediaType' => $imgdata['mime'],
-								'url' => $siteinfo['image'],
-								'name' => null];
-					}
-				}
-				break;
-			case 'video':
-				$attachments[] = ['type' => 'Document',
-						'mediaType' => 'text/html; charset=UTF-8',
-						'url' => $siteinfo['url'],
-						'name' => defaults($siteinfo, 'title', $siteinfo['url'])];
-				break;
-			default:
-				break;
-		}
-
-		if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo['type'] != 'photo') && isset($siteinfo['image'])) {
-			$imgdata = Image::getInfoFromURL($siteinfo['image']);
-			if ($imgdata) {
-				$attachments[] = ['type' => 'Document',
-						'mediaType' => $imgdata['mime'],
-						'url' => $siteinfo['image'],
-						'name' => null];
-			}
-		}
-
 		$arr = explode('[/attach],', $item['attach']);
 		if (count($arr)) {
 			foreach ($arr as $r) {
@@ -664,9 +628,47 @@ class Transmitter
 			}
 		}
 
+		if ($type != 'Note') {
+			return $attachments;
+		}
+
+		// Simplify image codes
+		$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $item['body']);
+
+		// 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' => $picture,
+						'name' => null];
+				}
+			}
+		}
+
 		return $attachments;
 	}
 
+	/**
+	 * @brief 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;
+	}
+
 	/**
 	 * @brief Fetches the "context" value for a givem item array from the "conversation" table
 	 *
@@ -682,12 +684,19 @@ class Transmitter
 		} elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
 			$context_uri = $conversation['conversation-uri'];
 		} else {
-			$context_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
+			$context_uri = $item['parent-uri'] . '#context';
 		}
 		return $context_uri;
 	}
 
-	private static function fetchSensitive($item_id)
+	/**
+	 * @brief 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'];
 		return DBA::exists('term', $condition);
@@ -698,9 +707,9 @@ class Transmitter
 	 *
 	 * @param array $item
 	 *
-	 * @return object array
+	 * @return array with the object data
 	 */
-	private static function createNote($item)
+	public static function createNote($item)
 	{
 		if (!empty($item['title'])) {
 			$type = 'Article';
@@ -729,30 +738,36 @@ 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'];
 		$data['attributedTo'] = $item['author-link'];
 		$data['actor'] = $item['author-link'];
-		$data['sensitive'] = self::fetchSensitive($item['id']);
+		$data['sensitive'] = self::isSensitive($item['id']);
 		$data['context'] = self::fetchContextURLForItem($item);
 
 		if (!empty($item['title'])) {
 			$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'])) {
 			$data['diaspora:comment'] = $item['signed_text'];
 		}
 
-		$data['attachment'] = self::createAttachmentList($item);
+		$data['attachment'] = self::createAttachmentList($item, $type);
 		$data['tag'] = self::createTagList($item);
 		$data = array_merge($data, self::createPermissionBlockForItem($item));
 
@@ -781,7 +796,7 @@ 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);
 	}
 
@@ -807,7 +822,7 @@ 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);
 	}
 
@@ -865,7 +880,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief 
+	 * @brief Reject a contact request or terminates the contact relation
 	 *
 	 * @param string $target Target profile
 	 * @param $id
@@ -892,7 +907,7 @@ class Transmitter
 	}
 
 	/**
-	 * @brief 
+	 * @brief Transmits a message that we don't want to follow this contact anymore
 	 *
 	 * @param string $target Target profile
 	 * @param integer $uid User ID