Merge remote-tracking branch 'upstream/develop' into no-item

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

diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php
index 61343566d64cfc6285f8d6359b0798f537969c3b..0535c223bba752084310f3b50b0cc32710793d2e 100644 (file)
--- a/src/Worker/ExpirePosts.php
+++ b/src/Worker/ExpirePosts.php
@@ -50,15 +50,18 @@ class ExpirePosts
                                Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]);
                                $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
                                        (SELECT `uri-id` FROM `post-thread` WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
-                                               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`)
-                                               AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin` 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-media` WHERE `uri-id` = `post-thread`.`uri-id`)
-                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `contact-id` AND `notify_new_posts`
+                                               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`)
+                                               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-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`
                                                        WHERE `parent-uri-id` = `post-thread`.`uri-id`)
-                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item`
-                                                       WHERE (`origin` OR `starred` OR `resource-id` != 0 OR `event-id` != 0 OR `wall` OR `attach` != '' OR `post-type` = ?)
-                                                               AND `parent-uri-id` = `post-thread`.`uri-id`))
+                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user`
+                                                       WHERE (`origin` OR `event-id` != 0 OR `post-type` = ?) AND `parent-uri-id` = `post-thread`.`uri-id`))
+                                               AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-content`
+                                                       WHERE (`resource-id` != 0) AND `uri-id` = `post-thread`.`uri-id`))
                                        ORDER BY `id` LIMIT ?", $expire_days, Item::PT_PERSONAL_NOTE, $limit);
 
                                $rows = DBA::affectedRows();
@@ -75,11 +78,11 @@ class ExpirePosts
                        do {
                                Logger::notice('Start deleting unclaimed public items', ['expiry_days' => $expire_days_unclaimed]);
                                $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
-                                       (SELECT `uri-id` FROM `item` WHERE `gravity` = ? AND `uid` = ? AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
-                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` AS `i` WHERE `i`.`uid` != ?
-                                                       AND `i`.`parent-uri-id` = `item`.`uri-id`)
-                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` AS `i` WHERE `i`.`uid` = ?
-                                                       AND `i`.`parent-uri-id` = `item`.`uri-id` AND `i`.`received` > UTC_TIMESTAMP() - INTERVAL ? DAY))
+                                       (SELECT `uri-id` FROM `post-user` WHERE `gravity` = ? AND `uid` = ? AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
+                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` AS `i` WHERE `i`.`uid` != ?
+                                                       AND `i`.`parent-uri-id` = `post-user`.`uri-id`)
+                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` AS `i` WHERE `i`.`uid` = ?
+                                                       AND `i`.`parent-uri-id` = `post-user`.`uri-id` AND `i`.`received` > UTC_TIMESTAMP() - INTERVAL ? DAY))
                                        ORDER BY `id` LIMIT ?",
                                        GRAVITY_PARENT, 0, $expire_days_unclaimed, 0, 0, $expire_days_unclaimed, $limit);