X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=045c48a4c1ced304920444f465f559bd6973d65a;hb=fc312e4c98ea51c19f190c72bbb73e70ef8b5ad7;hp=de17770601d839ead9ba88e830bf1b6a0ea1e163;hpb=75ec384fc3e42c77727e552751651029cd54a010;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index de17770601..045c48a4c1 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -5,6 +5,7 @@
 namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\Database\DBA;
+use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
@@ -15,6 +16,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Event;
 use Friendica\Model\Term;
 use Friendica\Model\User;
+use Friendica\Model\Mail;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\JsonLD;
@@ -48,7 +50,7 @@ class Processor
 	 *
 	 * @return string with replaced emojis
 	 */
-	public static function replaceEmojis($body, array $emojis)
+	private static function replaceEmojis($body, array $emojis)
 	{
 		foreach ($emojis as $emoji) {
 			$replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
@@ -62,10 +64,9 @@ class Processor
 	 *
 	 * @param array   $tags
 	 * @param boolean $sensitive
-	 * @param array   $implicit_mentions List of profile URLs to skip
 	 * @return string with tags
 	 */
-	private static function constructTagString(array $tags, $sensitive)
+	private static function constructTagString(array $tags = null, $sensitive = false)
 	{
 		if (empty($tags)) {
 			return '';
@@ -90,12 +91,13 @@ class Processor
 	/**
 	 * Add attachment data to the item array
 	 *
-	 * @param array $attachments
-	 * @param array $item
+	 * @param array   $attachments
+	 * @param array   $item
+	 * @param boolean $no_images
 	 *
 	 * @return array array
 	 */
-	private static function constructAttachList($attachments, $item)
+	private static function constructAttachList($attachments, $item, $no_images)
 	{
 		if (empty($attachments)) {
 			return $item;
@@ -104,6 +106,10 @@ class Processor
 		foreach ($attachments as $attach) {
 			$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
 			if ($filetype == 'image') {
+				if ($no_images) {
+					continue;
+				}
+
 				$item['body'] .= "\n[img]" . $attach['url'] . '[/img]';
 			} else {
 				if (!empty($item["attach"])) {
@@ -167,7 +173,7 @@ class Processor
 			$item['object-type'] = ACTIVITY_OBJ_COMMENT;
 		}
 
-		if (($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
+		if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
 			Logger::log('Parent ' . $activity['reply-to-id'] . ' not found. Try to refetch it.');
 			self::fetchMissingActivity($activity['reply-to-id'], $activity);
 		}
@@ -252,7 +258,7 @@ class Processor
 	 *
 	 * @param array $activity Activity array
 	 * @param array $item
-	 * @return array
+	 * @return array|bool Returns the item array or false if there was an unexpected occurrence
 	 * @throws \Exception
 	 */
 	private static function processContent($activity, $item)
@@ -263,10 +269,14 @@ class Processor
 			$item['body'] = $activity['source'];
 		} else {
 			$content = HTML::toBBCode($activity['content']);
-			$content = self::replaceEmojis($content, $activity['emojis']);
+
+			if (!empty($activity['emojis'])) {
+				$content = self::replaceEmojis($content, $activity['emojis']);
+			}
+
 			$content = self::convertMentions($content);
 
-			if (($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
+			if (empty($activity['directmessage']) && ($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
 				$item_private = !in_array(0, $activity['item_receiver']);
 				$parent = Item::selectFirst(['id', 'private', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
 				if (!DBA::isResult($parent)) {
@@ -314,8 +324,7 @@ class Processor
 	private static function postItem($activity, $item)
 	{
 		/// @todo What to do with $activity['context']?
-
-		if (($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['thr-parent']])) {
+		if (empty($activity['directmessage']) && ($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['thr-parent']])) {
 			Logger::info('Parent not found, message will be discarded.', ['thr-parent' => $item['thr-parent']]);
 			return;
 		}
@@ -347,7 +356,7 @@ class Processor
 
 		$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
 
-		$item = self::constructAttachList($activity['attachments'], $item);
+		$item = self::constructAttachList($activity['attachments'], $item, !empty($activity['source']));
 
 		$stored = false;
 
@@ -359,6 +368,11 @@ class Processor
 				$item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);
 			}
 
+			if (!empty($activity['directmessage'])) {
+				self::postMail($activity, $item);
+				continue;
+			}
+
 			if ($activity['object_type'] == 'as:Event') {
 				self::createEvent($activity, $item);
 			}
@@ -386,6 +400,69 @@ class Processor
 		}
 	}
 
+	/**
+	 * Creates an mail post
+	 *
+	 * @param array $activity Activity data
+	 * @param array $item     item array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function postMail($activity, $item)
+	{
+		if (($item['gravity'] != GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
+			Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
+			return false;
+		}
+
+		Logger::info('Direct Message', $item);
+
+		$msg = [];
+		$msg['uid'] = $item['uid'];
+
+		$msg['contact-id'] = $item['contact-id'];
+
+		$contact = Contact::getById($item['contact-id'], ['name', 'url', 'photo']);
+		$msg['from-name'] = $contact['name'];
+		$msg['from-url'] = $contact['url'];
+		$msg['from-photo'] = $contact['photo'];
+
+		$msg['uri'] = $item['uri'];
+		$msg['created'] = $item['created'];
+
+		$parent = DBA::selectFirst('mail', ['parent-uri', 'title'], ['uri' => $item['thr-parent']]);
+		if (DBA::isResult($parent)) {
+			$msg['parent-uri'] = $parent['parent-uri'];
+			$msg['title'] = $parent['title'];
+		} else {
+			$msg['parent-uri'] = $item['thr-parent'];
+
+			if (!empty($item['title'])) {
+				$msg['title'] = $item['title'];
+			} elseif (!empty($item['content-warning'])) {
+				$msg['title'] = $item['content-warning'];
+			} else {
+				// Trying to generate a title out of the body
+				$title = $item['body'];
+
+				while (preg_match('#^(@\[url=([^\]]+)].*?\[\/url]\s)(.*)#is', $title, $matches)) {
+					$title = $matches[3];
+				}
+
+				$title = trim(HTML::toPlaintext(BBCode::convert($title, false, 2, true), 0));
+
+				if (strlen($title) > 20) {
+					$title = substr($title, 0, 20) . '...';
+				}
+
+				$msg['title'] = $title;
+			}
+		}
+		$msg['body'] = $item['body'];
+
+                Mail::insert($msg);
+	}
+
 	/**
 	 * Fetches missing posts
 	 *
@@ -450,7 +527,7 @@ class Processor
 		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (!empty($cid)) {
 			self::switchContact($cid);
-			DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]);
+			DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
 			$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
 		} else {
 			$contact = false;
@@ -459,17 +536,19 @@ class Processor
 		$item = ['author-id' => Contact::getIdForURL($activity['actor']),
 			'author-link' => $activity['actor']];
 
+		$note = Strings::escapeTags(trim(defaults($activity, 'content', '')));
+
 		// Ensure that the contact has got the right network type
 		self::switchContact($item['author-id']);
 
-		Contact::addRelationship($owner, $contact, $item);
+		Contact::addRelationship($owner, $contact, $item, '', false, $note);
 		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (empty($cid)) {
 			return;
 		}
 
 		if (empty($contact)) {
-			DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]);
+			DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
 		}
 
 		Logger::log('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
@@ -574,7 +653,7 @@ class Processor
 
 		self::switchContact($cid);
 
-		if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING, 'pending' => true])) {
+		if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING])) {
 			Contact::remove($cid);
 			Logger::log('Rejected contact request from contact ' . $cid . ' for user ' . $uid . ' - contact had been removed.', Logger::DEBUG);
 		} else {
@@ -649,7 +728,7 @@ class Processor
 	private static function switchContact($cid)
 	{
 		$contact = DBA::selectFirst('contact', ['network'], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
-		if (!DBA::isResult($contact) || ($contact['network'] == Protocol::ACTIVITYPUB)) {
+		if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
 			return;
 		}