X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=921662a11542c9ecab671686ab25142ebc45b432;hb=295d90d496a56217383481fa7a0153e0ac48e38a;hp=34394ae4811f82ee67faddd3a560e56aa0d845ec;hpb=77a591e6e3f7fda5069d941764807fcc590cac15;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 34394ae481..921662a115 100644 --- 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)) {