X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FExpire.php;h=875e60e25d5425ce1b36fb11ecc50386dbc88fb0;hb=088a3b6bc429973381e6eb2931c6eacd5b8c8927;hp=37357fc1f213d588ce5ca537dd73ebccde71a880;hpb=e1c79a41d90fd092d3eea0b8763834e74499697b;p=friendica.git

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 37357fc1f2..875e60e25d 100644
--- 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
  *
@@ -25,10 +25,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Post;
 
 /**
  * Expires old item entries
@@ -41,74 +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 = Post::select(['item-id', 'guid', 'uri-id', 'uid'],  $condition);
-			while ($row = Post::fetch($rows)) {
-				Logger::info('Delete expired item', ['id' => $row['item-id'], 'guid' => $row['guid']]);
-				if (DBStructure::existsTable('item')) {
-					DBA::delete('item', ['id' => $row['item-id']]);
-				}
-				Post\User::delete(['uri-id' => $row['uri-id'], 'uid' => $row['uid']]);
-				Post\ThreadUser::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 `post-user` WHERE `post-user`.`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 `post-user` WHERE `post-user`.`uri-id` = `post-thread`.`uri-id`)"];
-			DBA::delete('post-thread', $condition);
-			Logger::info('Orphaned item content deleted', ['rows' => DBA::affectedRows()]);
-
-			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;
 	}