From: Michael <heluecht@pirati.ca>
Date: Mon, 2 Mar 2020 15:05:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into private
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=72c198990e3d6dd23628ad15600b2089882e03c4;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into private
---

72c198990e3d6dd23628ad15600b2089882e03c4
diff --cc src/Protocol/ActivityPub/Processor.php
index 75dcf3dbd1,724ac3092d..2e3264e091
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@@ -447,14 -449,13 +448,21 @@@ class Processo
  		$item['owner-link'] = $activity['actor'];
  		$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
  
 +		if (in_array(0, $activity['receiver']) && !empty($activity['unlisted'])) {
 +			$item['private'] = Item::UNLISTED;
 +		} elseif (in_array(0, $activity['receiver'])) {
 +			$item['private'] = Item::PUBLIC;
 +		} else {
 +			$item['private'] = Item::PRIVATE;
 +		}
 +
+ 		if (!empty($activity['raw'])) {
+ 			$item['source'] = $activity['raw'];
+ 			$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
+ 			$item['conversation-href'] = $activity['context'] ?? '';
+ 			$item['conversation-uri'] = $activity['conversation'] ?? '';
+ 		}
+ 
  		$isForum = false;
  
  		if (!empty($activity['thread-completion'])) {