Merge remote-tracking branch 'upstream/develop' into reduce-update-contacts

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

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 70a4f913a4a19f33d69469da3f2bd693da29f264..875e60e25d5425ce1b36fb11ecc50386dbc88fb0 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Post;
 
 /**
  * Expires old item entries
@@ -40,76 +39,42 @@ class Expire
 
                Hook::loadHooks();
 
-               if ($param == 'delete') {
-                       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', 'guid', 'uri-id', 'uid'],  $condition);
-                       while ($row = DBA::fetch($rows)) {
-                               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);
-
-                       Logger::info('Deleting orphaned post-content - start');
-                       /// @todo Replace "item with "post-user" in the future when "item" is removed
-                       $condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-content`.`uri-id`)"];
-                       DBA::delete('post-content', $condition);
-                       Logger::info('Orphaned post-content deleted', ['rows' => DBA::affectedRows()]);
-
-                       Logger::info('Deleting orphaned post-thread - start');
-                       /// @todo Replace "item with "post-user" in the future when "item" is removed
-                       $condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-thread`.`uri-id`)"];
-                       DBA::delete('post-thread', $condition);
-                       Logger::info('Orphaned item content deleted', ['rows' => DBA::affectedRows()]);
-
-                       // make this optional as it could have a performance impact on large sites
-                       if (intval(DI::config()->get('system', 'optimize_items'))) {
-                               DBA::e("OPTIMIZE TABLE `item`");
-                       }
-
-                       Logger::log('Delete expired items - done', Logger::DEBUG);
-                       return;
-               } elseif (intval($param) > 0) {
+               if (intval($param) > 0) {
                        $user = DBA::selectFirst('user', ['uid', 'username', 'expire'], ['uid' => $param]);
                        if (DBA::isResult($user)) {
-                               Logger::log('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], Logger::DEBUG);
+                               Logger::info('Expire items', ['user' => $user['uid'], 'username' => $user['username'], 'interval' => $user['expire']]);
                                Item::expire($user['uid'], $user['expire']);
-                               Logger::log('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', Logger::DEBUG);
+                               Logger::info('Expire items done', ['user' => $user['uid'], 'username' => $user['username'], 'interval' => $user['expire']]);
                        }
                        return;
                } elseif ($param == 'hook' && !empty($hook_function)) {
                        foreach (Hook::getByName('expire') as $hook) {
                                if ($hook[1] == $hook_function) {
-                                       Logger::log("Calling expire hook '" . $hook[1] . "'", Logger::DEBUG);
+                                       Logger::info('Calling expire hook', ['hook' => $hook[1]]);
                                        Hook::callSingle($a, 'expire', $hook, $data);
                                }
                        }
                        return;
                }
 
-               Logger::log('expire: start');
-
-               Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-                               'Expire', 'delete');
+               Logger::notice('start expiry');
 
-               $r = DBA::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0");
+               $r = DBA::select('user', ['uid', 'username'], ["`expire` != ?", 0]);
                while ($row = DBA::fetch($r)) {
-                       Logger::log('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', Logger::DEBUG);
-                       Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-                                       'Expire', (int)$row['uid']);
+                       Logger::info('Calling expiry', ['user' => $row['uid'], 'username' => $row['username']]);
+                       Worker::add(['priority' => $a->getQueueValue('priority'), 'created' => $a->getQueueValue('created'), 'dont_fork' => true],
+                               'Expire', (int)$row['uid']);
                }
                DBA::close($r);
 
-               Logger::log('expire: calling hooks');
+               Logger::notice('calling hooks');
                foreach (Hook::getByName('expire') as $hook) {
-                       Logger::log("Calling expire hook for '" . $hook[1] . "'", Logger::DEBUG);
-                       Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-                                       'Expire', 'hook', $hook[1]);
+                       Logger::info('Calling expire', ['hook' => $hook[1]]);
+                       Worker::add(['priority' => $a->getQueueValue('priority'), 'created' => $a->getQueueValue('created'), 'dont_fork' => true],
+                               'Expire', 'hook', $hook[1]);
                }
 
-               Logger::log('expire: end');
+               Logger::notice('calling hooks done');
 
                return;
        }