Move mod/toggle_mobile to src/Module/ToggleMobile

[friendica.git] / src / Worker / Delivery.php

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 34394ae4811f82ee67faddd3a560e56aa0d845ec..921662a11542c9ecab671686ab25142ebc45b432 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -17,6 +17,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
+use Friendica\Core\Worker;
 
 class Delivery extends BaseObject
 {
@@ -60,7 +61,7 @@ class Delivery extends BaseObject
                        }
                        $parent_id = intval($item['parent']);
 
-                       $condition = ['id' => [$target_id, $parent_id], 'moderated' => false];
+                       $condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false];
                        $params = ['order' => ['id']];
                        $itemdata = Model\Item::select([], $condition, $params);
 
@@ -321,8 +322,8 @@ class Delivery extends BaseObject
                Logger::log('Delivery to ' . $contact['url'] . ' with guid ' . defaults($target_item, 'guid', $target_item['id']) . ' returns ' . $deliver_status);
 
                if ($deliver_status < 0) {
-                       Logger::log('Delivery failed: queuing message ' . defaults($target_item, 'guid', $target_item['id']));
-                       Model\Queue::add($contact['id'], Protocol::DFRN, $atom, false, $target_item['guid']);
+                       Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
+                       Worker::defer();
                }
 
                if (($deliver_status >= 200) && ($deliver_status <= 299)) {