From: Michael <heluecht@pirati.ca>
Date: Sat, 18 May 2019 07:00:57 +0000 (+0000)
Subject: Fix for receiving direct messages from Mastodon
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=490e850b4880d41c3b8887c8f278d3279de5a8ed;p=friendica.git

Fix for receiving direct messages from Mastodon
---

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 70728edc9e..045c48a4c1 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -173,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);
 		}
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 7ae68cd4d1..74d9392752 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -207,7 +207,13 @@ class Receiver
 				return [];
 			}
 			$object_data['object_id'] = $object_id;
-			$object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
+
+			// Test if it is an answer to a mail
+			if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) {
+				$object_data['directmessage'] = true;
+			} else {
+				$object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
+			}
 
 			// We had been able to retrieve the object data - so we can trust the source
 			$trust_source = true;
@@ -936,11 +942,6 @@ class Receiver
 
 		$object_data['receiver'] = self::getReceivers($object, $object_data['actor'], $object_data['tags']);
 
-		// Test if it is an answer to a mail
-		if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) {
-			$object_data['directmessage'] = true;
-		}
-
 		// Common object data:
 
 		// Unhandled