X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=e6f3e156690042bd1701c20c9d662b181238c048;hb=befc2af5043a3afde251721c0d27df695db1bb7e;hp=f281c7ee6405aa9850918133667452af3a85d329;hpb=dc842f4f37a5ff9cb787cac23272c38faf2ff892;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index f281c7ee64..e6f3e15669 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,7 @@ namespace Friendica\Protocol\ActivityPub;
 use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -32,6 +33,7 @@ use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Event;
+use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
@@ -65,6 +67,26 @@ class Processor
 		return $body;
 	}
 
+	/**
+	 * Convert the language array into a language JSON
+	 *
+	 * @param array $languages
+	 * @return string language JSON
+	 */
+	private static function processLanguages(array $languages)
+	{
+		$codes = array_keys($languages);
+		$lang = [];
+		foreach ($codes as $code) {
+			$lang[$code] = 1;
+		}
+
+		if (empty($lang)) {
+			return '';
+		}
+
+		return json_encode($lang);
+	}
 	/**
 	 * Replaces emojis in the body
 	 *
@@ -193,13 +215,13 @@ class Processor
 							continue 2;
 						}
 
-						$item['body'] .= "\n[audio]" . $attach['url'] . '[/audio]';
+						$item['body'] = '[audio]' . $attach['url'] . "[/audio]\n" . $item['body'];
 					} elseif ($filetype == 'video') {
 						if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
 							continue 2;
 						}
 
-						$item['body'] .= "\n[video]" . $attach['url'] . '[/video]';
+						$item['body'] = '[video]' . $attach['url'] . "[/video]\n" . $item['body'];
 					}
 			}
 		}
@@ -346,6 +368,19 @@ class Processor
 
 		$item = self::constructAttachList($activity, $item);
 
+		// We received the post via AP, so we set the protocol of the server to AP
+		$contact = Contact::getById($item['author-id'], ['gsid']);
+		if (!empty($contact['gsid'])) {
+			GServer::setProtocol($contact['gsid'], Post\DeliveryData::ACTIVITYPUB);
+		}
+
+		if ($item['author-id'] != $item['owner-id']) {
+			$contact = Contact::getById($item['owner-id'], ['gsid']);
+			if (!empty($contact['gsid'])) {
+				GServer::setProtocol($contact['gsid'], Post\DeliveryData::ACTIVITYPUB);
+			}
+		}
+
 		return $item;
 	}
 
@@ -463,9 +498,21 @@ class Processor
 	 */
 	private static function processContent($activity, $item)
 	{
-		$item['title'] = HTML::toBBCode($activity['name']);
+		if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) {
+			$item['title'] = Markdown::toBBCode($activity['name']);
+			$content = Markdown::toBBCode($activity['content']);
+		} elseif (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/bbcode')) {
+			$item['title'] = $activity['name'];
+			$content = $activity['content'];
+		} else {
+			// By default assume "text/html"
+			$item['title'] = HTML::toBBCode($activity['name']);
+			$content = HTML::toBBCode($activity['content']);
+		}
 
-		$content = HTML::toBBCode($activity['content']);
+		if (!empty($activity['languages'])) {
+			$item['language'] = self::processLanguages($activity['languages']);
+		}
 
 		if (!empty($activity['emojis'])) {
 			$content = self::replaceEmojis($content, $activity['emojis']);
@@ -868,8 +915,9 @@ class Processor
 		}
 
 		$replyto = JsonLD::fetchElement($activity['as:object'], 'as:inReplyTo', '@id');
-		if (Post::exists(['uri' => $replyto])) {
-			Logger::info('Post is a reply to an existing post - accepted', ['id' => $id, 'replyto' => $replyto]);
+		$uriid = ItemURI::getIdByURI($replyto);
+		if (Post::exists(['uri-id' => $uriid])) {
+			Logger::info('Post is a reply to an existing post - accepted', ['id' => $id, 'uri-id' => $uriid, 'replyto' => $replyto]);
 			return true;
 		}
 
@@ -1142,7 +1190,7 @@ class Processor
 
 		$implicit_mentions = [];
 		if (empty($parent_author['url'])) {
-			Logger::notice('Author public contact unknown.', ['author-link' => $parent['author-link'], 'item-id' => $parent['id']]);
+			Logger::notice('Author public contact unknown.', ['author-link' => $parent['author-link'], 'parent-id' => $parent['id']]);
 		} else {
 			$implicit_mentions[] = $parent_author['url'];
 			$implicit_mentions[] = $parent_author['nurl'];