Get rid of the "item" table, enhanced "post" tables

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

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 3c6b877..d5a3e8f 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -35,6 +35,7 @@ use Friendica\Util\Network;
 use Friendica\Core\Worker;
 use Friendica\Model\Conversation;
 use Friendica\Model\FContact;
+use Friendica\Model\Item;
 use Friendica\Protocol\Relay;
 
 class Delivery
@@ -80,9 +81,9 @@ class Delivery
                        }
                        $parent_id = intval($item['parent']);
 
-                       $condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false];
+                       $condition = ['id' => [$target_id, $parent_id], 'visible' => true];
                        $params = ['order' => ['id']];
-                       $itemdata = Model\Post::select([], $condition, $params);
+                       $itemdata = Model\Post::select(Item::DELIVER_FIELDLIST, $condition, $params);
 
                        while ($item = Model\Post::fetch($itemdata)) {
                                if ($item['verb'] == Activity::ANNOUNCE) {