X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=c0bc1a5a072db2e46e1ec0c45e187c36f43a7c3f;hb=dc69116572c7ab45987c6ecb19edfa1bca5068b7;hp=8bdb878abe10f90bcf0e551ce2fe0a5f826b7844;hpb=7e732839491f83ea3b3618aee8f38fab9f881995;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 8bdb878abe..c0bc1a5a07 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -796,7 +796,7 @@ class Diaspora
 	 */
 	private static function key(WebFingerUri $uri): string
 	{
-		Logger::info('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]);
+		Logger::info('Fetching diaspora key', ['handle' => $uri->getAddr()]);
 		try {
 			return DI::dsprContact()->getByAddr($uri)->pubKey;
 		} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
@@ -1192,6 +1192,7 @@ class Diaspora
 	{
 		$fields = [
 			'id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
+			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
 			'author-name', 'author-link', 'author-avatar', 'gravity',
 			'owner-name', 'owner-link', 'owner-avatar'
 		];
@@ -1567,6 +1568,12 @@ class Diaspora
 		$datarray['verb'] = Activity::POST;
 		$datarray['gravity'] = Item::GRAVITY_COMMENT;
 
+		$datarray['private']   = $toplevel_parent_item['private'];
+		$datarray['allow_cid'] = $toplevel_parent_item['allow_cid'];
+		$datarray['allow_gid'] = $toplevel_parent_item['allow_gid'];
+		$datarray['deny_cid']  = $toplevel_parent_item['deny_cid'];
+		$datarray['deny_gid']  = $toplevel_parent_item['deny_gid'];
+
 		$datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri'];
 
 		$datarray['object-type'] = Activity\ObjectType::COMMENT;
@@ -1823,6 +1830,13 @@ class Diaspora
 
 		$datarray['verb'] = $verb;
 		$datarray['gravity'] = Item::GRAVITY_ACTIVITY;
+
+		$datarray['private']   = $toplevel_parent_item['private'];
+		$datarray['allow_cid'] = $toplevel_parent_item['allow_cid'];
+		$datarray['allow_gid'] = $toplevel_parent_item['allow_gid'];
+		$datarray['deny_cid']  = $toplevel_parent_item['deny_cid'];
+		$datarray['deny_gid']  = $toplevel_parent_item['deny_gid'];
+
 		$datarray['thr-parent'] = $toplevel_parent_item['uri'];
 
 		$datarray['object-type'] = Activity\ObjectType::NOTE;
@@ -3022,7 +3036,7 @@ class Diaspora
 			// The "addr" field should always be filled.
 			// If this isn't the case, it will raise a notice some lines later.
 			// And in the log we will see where it came from, and we can handle it there.
-			Logger::notice('Empty addr', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]);
+			Logger::notice('Empty addr', ['contact' => $contact ?? []]);
 		}
 
 		$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey ?? '', $public_batch);