X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=545ac22c699b0a668cfe486c7d17f617dd01d123;hb=85b3c880ef1ba48091acdfe649c35eef6c1c8f15;hp=d2581ff3f45e9f929692b399e59f1dce222b12b1;hpb=cbe435bb708ccf17a4b5bea1e20c3258c9524700;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index d2581ff3f4..545ac22c69 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -6,30 +6,32 @@ namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
-use Friendica\Database\DBA;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
-use Friendica\Util\HTTPSignature;
 use Friendica\Core\Protocol;
-use Friendica\Model\Conversation;
-use Friendica\Model\Contact;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
+use Friendica\Model\Photo;
 use Friendica\Model\Term;
 use Friendica\Model\User;
+use Friendica\Protocol\Activity;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\Plaintext;
-use Friendica\Util\XML;
+use Friendica\Util\HTTPSignature;
+use Friendica\Util\Images;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
-use Friendica\Model\Profile;
-use Friendica\Object\Image;
-use Friendica\Protocol\ActivityPub;
-use Friendica\Core\Cache;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 require_once 'include/api.php';
 require_once 'mod/share.php';
@@ -761,25 +763,25 @@ class Transmitter
 
 		if ($reshared) {
 			$type = 'Announce';
-		} elseif ($item['verb'] == ACTIVITY_POST) {
+		} elseif ($item['verb'] == Activity::POST) {
 			if ($item['created'] == $item['edited']) {
 				$type = 'Create';
 			} else {
 				$type = 'Update';
 			}
-		} elseif ($item['verb'] == ACTIVITY_LIKE) {
+		} elseif ($item['verb'] == Activity::LIKE) {
 			$type = 'Like';
-		} elseif ($item['verb'] == ACTIVITY_DISLIKE) {
+		} elseif ($item['verb'] == Activity::DISLIKE) {
 			$type = 'Dislike';
-		} elseif ($item['verb'] == ACTIVITY_ATTEND) {
+		} elseif ($item['verb'] == Activity::ATTEND) {
 			$type = 'Accept';
-		} elseif ($item['verb'] == ACTIVITY_ATTENDNO) {
+		} elseif ($item['verb'] == Activity::ATTENDNO) {
 			$type = 'Reject';
-		} elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
+		} elseif ($item['verb'] == Activity::ATTENDMAYBE) {
 			$type = 'TentativeAccept';
-		} elseif ($item['verb'] == ACTIVITY_FOLLOW) {
+		} elseif ($item['verb'] == Activity::FOLLOW) {
 			$type = 'Follow';
-		} elseif ($item['verb'] == ACTIVITY_TAG) {
+		} elseif ($item['verb'] == Activity::TAG) {
 			$type = 'Add';
 		} else {
 			$type = '';
@@ -1048,7 +1050,7 @@ class Transmitter
 		// Grab all pictures without alternative descriptions and create attachments out of them
 		if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) {
 			foreach ($pictures[1] as $picture) {
-				$imgdata = Image::getInfoFromURL($picture);
+				$imgdata = Images::getInfoFromURLCached($picture);
 				if ($imgdata) {
 					$attachments[] = ['type' => 'Document',
 						'mediaType' => $imgdata['mime'],
@@ -1061,7 +1063,7 @@ class Transmitter
 		// Grab all pictures with alternative description and create attachments out of them
 		if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
 			foreach ($pictures as $picture) {
-				$imgdata = Image::getInfoFromURL($picture[1]);
+				$imgdata = Images::getInfoFromURLCached($picture[1]);
 				if ($imgdata) {
 					$attachments[] = ['type' => 'Document',
 						'mediaType' => $imgdata['mime'],
@@ -1096,19 +1098,34 @@ class Transmitter
 	}
 
 	/**
-	 * Remove image elements and replaces them with links to the image
+	 * Remove image elements since they are added as attachment
 	 *
 	 * @param string $body
 	 *
-	 * @return string with replaced elements
+	 * @return string with removed images
 	 */
 	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("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
+
+		// Now remove local links
+		$body = preg_replace_callback(
+			'/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi',
+			function ($match) {
+				// We remove the link when it is a link to a local photo page
+				if (Photo::isLocalPage($match[1])) {
+					return '';
+				}
+				// otherwise we just return the link
+				return '[url]' . $match[1] . '[/url]';
+			},
+			$body
+		);
 
-		$body = preg_replace("/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi", '[url]$1[/url]', $body);
-		$body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '[url]$1[/url]', $body);
+		// Remove all pictures
+		$body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '', $body);
 
 		return $body;
 	}
@@ -1253,6 +1270,12 @@ class Transmitter
 			$data['content'] = BBCode::convert($body, false, 9);
 		}
 
+		$regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
+		$richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
+
+		$data['contentMap']['text/html'] = BBCode::convert($richbody, false);
+		$data['contentMap']['text/markdown'] = BBCode::toMarkdown($item["body"]);
+
 		$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
 
 		if (!empty($item['signed_text']) && ($item['uri'] != $item['thr-parent'])) {
@@ -1571,7 +1594,7 @@ class Transmitter
 			$uid = $first_user['uid'];
 		}
 
-		$condition = ['verb' => ACTIVITY_FOLLOW, 'uid' => 0, 'parent-uri' => $object,
+		$condition = ['verb' => Activity::FOLLOW, 'uid' => 0, 'parent-uri' => $object,
 			'author-id' => Contact::getPublicIdByUserId($uid)];
 		if (Item::exists($condition)) {
 			Logger::log('Follow for ' . $object . ' for user ' . $uid . ' does already exist.', Logger::DEBUG);