X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=1d1e8702b28c60390eea80d29e67fe0d5aa1ed12;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=8a84f34a2f07f0c562da6d28b06b151e1b2561ab;hpb=ce52d31afa9cb9f925cac560a04e5999f745498a;p=friendica.git

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 8a84f34a2f..1d1e8702b2 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -141,13 +141,7 @@ class Delivery
 				}
 			}
 
-			// When commenting too fast after delivery, a post wasn't recognized as top level post.
-			// The count then showed more than one entry. The additional check should help.
-			// The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
-			if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
-				Logger::log('Top level post');
-				$top_level = true;
-			}
+			$top_level = $target_item['gravity'] == GRAVITY_PARENT;
 
 			// This is IMPORTANT!!!!
 
@@ -211,7 +205,8 @@ class Delivery
 		// Transmit via Diaspora if the thread had started as Diaspora post.
 		// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
 		// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
-		if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network']])) {
+		// Also transmit relayed posts from Diaspora contacts via Diaspora.
+		if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network'], $target_item['network']])) {
 			$contact['network'] = Protocol::DIASPORA;
 		}