Merge pull request #448 from fermionic/limit-items-on-all-pages

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 235b766c5fb04d5813f5223ac401c0e17e3af0b4..1328771a6789bb3e623459e95e70ec76fd009c50 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -113,7 +113,7 @@ function delivery_run($argv, $argc){
                        $uid = $r[0]['uid'];
                        $updated = $r[0]['edited'];
 
-                       // The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
+                       // POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
                        if(! $parent_id)
                                continue;
 
@@ -280,7 +280,7 @@ function delivery_run($argv, $argc){
                                                continue;
 
                                        // private emails may be in included in public conversations. Filter them.
-                                       if(($public_message) && $item['private'])
+                                       if(($public_message) && $item['private'] == 1)
                                                continue;
 
                                        $item_contact = get_item_contact($item,$icontacts);
@@ -383,7 +383,7 @@ function delivery_run($argv, $argc){
                                                        continue;
 
                                                // private emails may be in included in public conversations. Filter them.
-                                               if(($public_message) && $item['private'])
+                                               if(($public_message) && $item['private'] == 1)
                                                        continue;
        
                                                $item_contact = get_item_contact($item,$icontacts);
@@ -509,17 +509,17 @@ function delivery_run($argv, $argc){
                                        // unsupported
                                        break;
                                }
-                               elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
-                               logger('delivery: diaspora retract: ' . $loc);
-                                       // diaspora delete, 
+                               elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
+                                       // top-level retraction
+                                       logger('delivery: diaspora retract: ' . $loc);
+
                                        diaspora_send_retraction($target_item,$owner,$contact,$public_message);
                                        break;
                                }
                                elseif($target_item['uri'] !== $target_item['parent-uri']) {
+                                       // we are the relay - send comments, likes and relayable_retractions to our conversants
+                                       logger('delivery: diaspora relay: ' . $loc);
 
-                               logger('delivery: diaspora relay: ' . $loc);
-
-                                       // we are the relay - send comments, likes, unlikes and relayable_retractions to our conversants
                                        diaspora_send_relay($target_item,$owner,$contact,$public_message);
                                        break;
                                }