X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FExpirePosts.php;h=8d50c5d9d5494366ba4de6c83259aa9c53f458c1;hb=2b17e36a6762c205c2cd777e0386c42ae83610f2;hp=3a49453257a19218866834397029a3ec9b786e70;hpb=b3e5621d377b06a2ef29bfcf515d298de7b739ae;p=friendica.git

diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php
index 3a49453257..8d50c5d9d5 100644
--- a/src/Worker/ExpirePosts.php
+++ b/src/Worker/ExpirePosts.php
@@ -25,7 +25,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\DateTimeFormat;
+use Friendica\Model\Item;
 
 class ExpirePosts
 {
@@ -49,18 +49,20 @@ class ExpirePosts
 			do {
 				Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]);
 				$ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
-					(SELECT `uri-id` FROM `thread`
-					INNER JOIN `contact` ON `id` = `contact-id` AND NOT `notify_new_posts`
-					WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
-						AND NOT `mention` AND NOT `starred` AND NOT `wall` AND NOT `origin`
-						AND `thread`.`uid` != 0 AND NOT `iid` IN (SELECT `parent` FROM `item`
-							WHERE (`item`.`starred` OR (`item`.`resource-id` != '')
-								OR (`item`.`event-id` != '') OR (`item`.`attach` != '')
-								OR `item`.`wall` OR `item`.`origin`
-								OR `uri-id` IN (SELECT `uri-id` FROM `post-category`
-									WHERE `uri-id` = `item`.`uri-id`))
-								AND `item`.`parent` = `thread`.`iid`))
-					ORDER BY `id` LIMIT ?", $expire_days, $limit);
+					(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-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 `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();
 				Logger::notice('Deleted expired threads', ['result' => $ret, 'rows' => $rows]);
@@ -73,16 +75,16 @@ class ExpirePosts
 		}
 
 		if (!empty($expire_days_unclaimed)) {
-			$expiry_date = DateTimeFormat::utc('now - ' . $expire_days_unclaimed . ' days', DateTimeFormat::MYSQL);
-
 			do {
-				Logger::notice('Start deleting unclaimed public items', ['expiry_days' => $expire_days_unclaimed, 'expired' => $expiry_date]);
+				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` < ?
-						AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` != ?)
-						AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` = ? AND `received` > ?))
+					(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, $expiry_date, 0, 0, $expiry_date, $limit);
+					GRAVITY_PARENT, 0, $expire_days_unclaimed, 0, 0, $expire_days_unclaimed, $limit);
 
 				$rows = DBA::affectedRows();
 				Logger::notice('Deleted unclaimed public items', ['result' => $ret, 'rows' => $rows]);