Merge remote-tracking branch 'upstream/develop' into post-thread-user

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

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index dfbf9738e6379fbaaa301ac8183dba10a1bf10d1..2c419c401af9ef7b1268a573b08e095146667e77 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -27,6 +27,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 
 /**
  * Expires old item entries
@@ -43,23 +44,19 @@ class Expire
                        Logger::log('Delete expired items', Logger::DEBUG);
                        // physically remove anything that has been deleted for more than two months
                        $condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"];
-                       $rows = DBA::select('item', ['id'],  $condition);
+                       $rows = DBA::select('item', ['id', 'guid', 'uri-id', 'uid'],  $condition);
                        while ($row = DBA::fetch($rows)) {
-                               Logger::notice('Delete expired item', ['id' => $row["id"]]);
+                               Logger::info('Delete expired item', ['id' => $row['id'], 'guid' => $row['guid']]);
                                DBA::delete('item', ['id' => $row['id']]);
+                               Post\User::delete(['uri-id' => $row['uri-id'], 'uid' => $row['uid']]);
                        }
                        DBA::close($rows);
 
                        // Normally we shouldn't have orphaned data at all.
                        // If we do have some, then we have to check why.
-                       Logger::log('Deleting orphaned item activities - start', Logger::DEBUG);
-                       $condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`iaid` = `item-activity`.`id`)"];
-                       DBA::delete('item-activity', $condition);
-                       Logger::log('Orphaned item activities deleted: ' . DBA::affectedRows(), Logger::DEBUG);
-
                        Logger::log('Deleting orphaned item content - start', Logger::DEBUG);
-                       $condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`icid` = `item-content`.`id`)"];
-                       DBA::delete('item-content', $condition);
+                       $condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-content`.`uri-id`)"];
+                       DBA::delete('post-content', $condition);
                        Logger::log('Orphaned item content deleted: ' . DBA::affectedRows(), Logger::DEBUG);
 
                        // make this optional as it could have a performance impact on large sites