X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FReceiver.php;h=685f3a85e2b13e1bc2af97c09cfb1f0ea4515ae9;hb=8644d300d0a7105b45c49a41ac6144875a02367a;hp=058d210a24072d484d799a9ff2f4933e2c29cce3;hpb=f1e7d97b8cae93e1c77f5a5085880409b01fcdbe;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 058d210a24..685f3a85e2 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -5,6 +5,8 @@
 namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\Database\DBA;
+use Friendica\Content\Text\HTML;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
@@ -12,6 +14,7 @@ use Friendica\Model\APContact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Model\User;
+use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
@@ -46,8 +49,8 @@ class Receiver
 	 */
 	public static function isRequest()
 	{
-		return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
-			stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
+		return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
+			stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
 	}
 
 	/**
@@ -260,7 +263,7 @@ class Receiver
 		$object_data['type'] = $type;
 		$object_data['actor'] = $actor;
 		$object_data['item_receiver'] = $receivers;
-		$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
+		$object_data['receiver'] = array_merge($object_data['receiver'] ?? [], $receivers);
 
 		Logger::log('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], Logger::DEBUG);
 
@@ -301,9 +304,9 @@ class Receiver
 		$conversation = [
 			'protocol' => Conversation::PARCEL_ACTIVITYPUB,
 			'item-uri' => $activity['id'],
-			'reply-to-uri' => defaults($activity, 'reply-to-id', ''),
-			'conversation-href' => defaults($activity, 'context', ''),
-			'conversation-uri' => defaults($activity, 'conversation', ''),
+			'reply-to-uri' => $activity['reply-to-id'] ?? '',
+			'conversation-href' => $activity['context'] ?? '',
+			'conversation-uri' => $activity['conversation'] ?? '',
 			'source' => $body,
 			'received' => DateTimeFormat::utcNow()];
 
@@ -400,26 +403,26 @@ class Receiver
 						$announce_object_data['object_id'] = $object_data['object_id'];
 						$announce_object_data['object_type'] = $object_data['object_type'];
 
-						ActivityPub\Processor::createActivity($announce_object_data, ACTIVITY2_ANNOUNCE);
+						ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE);
 					}
 				}
 				break;
 
 			case 'as:Like':
 				if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-					ActivityPub\Processor::createActivity($object_data, ACTIVITY_LIKE);
+					ActivityPub\Processor::createActivity($object_data, Activity::LIKE);
 				}
 				break;
 
 			case 'as:Dislike':
 				if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-					ActivityPub\Processor::createActivity($object_data, ACTIVITY_DISLIKE);
+					ActivityPub\Processor::createActivity($object_data, Activity::DISLIKE);
 				}
 				break;
 
 			case 'as:TentativeAccept':
 				if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-					ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTENDMAYBE);
+					ActivityPub\Processor::createActivity($object_data, Activity::ATTENDMAYBE);
 				}
 				break;
 
@@ -444,7 +447,7 @@ class Receiver
 					ActivityPub\Processor::followUser($object_data);
 				} elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
 					$object_data['reply-to-id'] = $object_data['object_id'];
-					ActivityPub\Processor::createActivity($object_data, ACTIVITY_FOLLOW);
+					ActivityPub\Processor::createActivity($object_data, Activity::FOLLOW);
 				}
 				break;
 
@@ -452,7 +455,7 @@ class Receiver
 				if ($object_data['object_type'] == 'as:Follow') {
 					ActivityPub\Processor::acceptFollowUser($object_data);
 				} elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-					ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTEND);
+					ActivityPub\Processor::createActivity($object_data, Activity::ATTEND);
 				}
 				break;
 
@@ -460,7 +463,7 @@ class Receiver
 				if ($object_data['object_type'] == 'as:Follow') {
 					ActivityPub\Processor::rejectFollowUser($object_data);
 				} elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-					ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTENDNO);
+					ActivityPub\Processor::createActivity($object_data, Activity::ATTENDNO);
 				}
 				break;
 
@@ -508,7 +511,7 @@ class Receiver
 
 		if (!empty($actor)) {
 			$profile = APContact::getByURL($actor);
-			$followers = defaults($profile, 'followers', '');
+			$followers = $profile['followers'] ?? '';
 
 			Logger::log('Actor: ' . $actor . ' - Followers: ' . $followers, Logger::DEBUG);
 		} else {
@@ -873,6 +876,52 @@ class Receiver
 		return $attachlist;
 	}
 
+	/**
+	 * Fetch the original source or content with the "language" Markdown or HTML
+	 *
+	 * @param array $object
+	 * @param array $object_data
+	 *
+	 * @return array
+	 * @throws \Exception
+	 */
+	private static function getSource($object, $object_data)
+	{
+		$object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
+		$object_data['source'] = JsonLD::fetchElement($object_data, 'source', '@value');
+		if (!empty($object_data['source'])) {
+			return $object_data;
+		}
+
+		$object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/markdown');
+		$object_data['source'] = JsonLD::fetchElement($object_data, 'source', '@value');
+		if (!empty($object_data['source'])) {
+			$object_data['source'] = Markdown::toBBCode($object_data['source']);
+			return $object_data;
+		}
+
+		$object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/html');
+		$object_data['source'] = JsonLD::fetchElement($object_data, 'source', '@value');
+		if (!empty($object_data['source'])) {
+			$object_data['source'] = HTML::toBBCode($object_data['source']);
+			return $object_data;
+		}
+
+		$markdown = JsonLD::fetchElement($object, 'as:content', '@value', '@language', 'text/markdown');
+		if (!empty($markdown)) {
+			$object_data['source'] = Markdown::toBBCode($markdown);
+			return $object_data;
+		}
+
+		$html = JsonLD::fetchElement($object, 'as:content', '@value', '@language', 'text/html');
+		if (!empty($html)) {
+			$object_data['source'] = HTML::toBBCode($markdown);
+			return $object_data;
+		}
+
+		return $object_data;
+	}
+
 	/**
 	 * Fetches data from the object part of an activity
 	 *
@@ -923,8 +972,7 @@ class Receiver
 		$object_data['name'] = JsonLD::fetchElement($object, 'as:name', '@value');
 		$object_data['summary'] = JsonLD::fetchElement($object, 'as:summary', '@value');
 		$object_data['content'] = JsonLD::fetchElement($object, 'as:content', '@value');
-		$object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
-		$object_data['source'] = JsonLD::fetchElement($object_data, 'source', '@value');
+		$object_data = self::getSource($object, $object_data);
 		$object_data['start-time'] = JsonLD::fetchElement($object, 'as:startTime', '@value');
 		$object_data['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value');
 		$object_data['location'] = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place');