Fill the item cache when storing item

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

diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php
index 4e06229ea9c155a81cf0b0a4898265b8254a7f6d..52d792ea6288cb482fd1da3ef33901f90ffcebe9 100644 (file)
--- a/src/Worker/ExpirePosts.php
+++ b/src/Worker/ExpirePosts.php
@@ -189,6 +189,9 @@ class ExpirePosts
                        AND NOT EXISTS(SELECT `uri-id` FROM `contact` WHERE `uri-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `uri-id` FROM `apcontact` WHERE `uri-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `uri-id` FROM `fcontact` WHERE `uri-id` = `item-uri`.`id`)
+                       AND NOT EXISTS(SELECT `uri-id` FROM `inbox-status` WHERE `uri-id` = `item-uri`.`id`)
+                       AND NOT EXISTS(SELECT `uri-id` FROM `post-delivery` WHERE `uri-id` = `item-uri`.`id`)
+                       AND NOT EXISTS(SELECT `uri-id` FROM `post-delivery` WHERE `inbox-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `parent-uri-id` FROM `mail` WHERE `parent-uri-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `thr-parent-id` FROM `mail` WHERE `thr-parent-id` = `item-uri`.`id`)", $item['uri-id']]);
 
@@ -225,9 +228,11 @@ class ExpirePosts
                        $uris = DBA::select('item-uri', ['id'], ["`id` IN
                                (SELECT `uri-id` FROM `post-thread` WHERE `received` < ?
                                        AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-thread-user`
-                                               WHERE (`mention` OR `starred` OR `wall` OR `pinned`) AND `uri-id` = `post-thread`.`uri-id`)
+                                               WHERE (`mention` OR `starred` OR `wall`) AND `uri-id` = `post-thread`.`uri-id`)
                                        AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-category`
                                                WHERE `uri-id` = `post-thread`.`uri-id`)
+                                       AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-collection`
+                                               WHERE `uri-id` = `post-thread`.`uri-id`)
                                        AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-media`
                                                WHERE `uri-id` = `post-thread`.`uri-id`)
                                        AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` INNER JOIN `contact` ON `contact`.`id` = `contact-id` AND `notify_new_posts`