X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveUnusedContacts.php;h=f93e3eb50716ac36eae5323d6d289bcddb34441d;hb=7d7d310cc4f8661751fd2a62e33405c98f78aa62;hp=f90abe369a15a5a060d71765ed24109c7d3c1c15;hpb=5e846dd7c29fe93e583c195e97513e221dac31b9;p=friendica.git

diff --git a/src/Worker/RemoveUnusedContacts.php b/src/Worker/RemoveUnusedContacts.php
index f90abe369a..f93e3eb507 100644
--- a/src/Worker/RemoveUnusedContacts.php
+++ b/src/Worker/RemoveUnusedContacts.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -34,15 +34,14 @@ class RemoveUnusedContacts
 {
 	public static function execute()
 	{
-		$condition = ["`uid` = ? AND NOT `self` AND NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` != ?)
+		$condition = ["`id` != ? AND `uid` = ? AND NOT `self` AND NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` != ?)
 			AND (NOT `network` IN (?, ?, ?, ?, ?, ?) OR (`archive` AND `success_update` < UTC_TIMESTAMP() - INTERVAL ? DAY))
-			AND NOT `id` IN (SELECT `author-id` FROM `item`) AND NOT `id` IN (SELECT `owner-id` FROM `item`)
-			AND NOT `id` IN (SELECT `causer-id` FROM `item`) AND NOT `id` IN (SELECT `cid` FROM `post-tag`)
-			AND NOT `id` IN (SELECT `contact-id` FROM `item`) AND NOT `id` IN (SELECT `author-id` FROM `post-thread`)
-			AND NOT `id` IN (SELECT `owner-id` FROM `post-thread`) AND NOT `id` IN (SELECT `causer-id` FROM `post-thread`)
-			AND NOT `id` IN (SELECT `contact-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `user-contact`) 
-			AND NOT `id` IN (SELECT `cid` FROM `event`) AND NOT `id` IN (SELECT `contact-id` FROM `group_member`)",
-			0, 0, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Protocol::ACTIVITYPUB, 365];
+			AND NOT `id` IN (SELECT `author-id` FROM `post-user`) AND NOT `id` IN (SELECT `owner-id` FROM `post-user`)
+			AND NOT `id` IN (SELECT `causer-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `post-tag`)
+			AND NOT `id` IN (SELECT `contact-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `user-contact`)
+			AND NOT `id` IN (SELECT `cid` FROM `event`) AND NOT `id` IN (SELECT `contact-id` FROM `group_member`)
+			AND `created` < UTC_TIMESTAMP() - INTERVAL ? DAY",
+			0, 0, 0, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Protocol::ACTIVITYPUB, 365, 30];
 
 		$total = DBA::count('contact', $condition);
 		Logger::notice('Starting removal', ['total' => $total]);
@@ -54,6 +53,26 @@ class RemoveUnusedContacts
 					DBA::delete('thread', ['owner-id' => $contact['id']]);
 					DBA::delete('thread', ['author-id' => $contact['id']]);
 				}
+				if (DBStructure::existsTable('item')) {
+					DBA::delete('item', ['owner-id' => $contact['id']]);
+					DBA::delete('item', ['author-id' => $contact['id']]);
+					DBA::delete('item', ['causer-id' => $contact['id']]);
+				}
+
+				// There should be none entry for the contact in these tables when none was found in "post-user".
+				// But we want to be sure since the foreign key prohibits deletion otherwise.
+				DBA::delete('post', ['owner-id' => $contact['id']]);
+				DBA::delete('post', ['author-id' => $contact['id']]);
+				DBA::delete('post', ['causer-id' => $contact['id']]);
+				
+				DBA::delete('post-thread', ['owner-id' => $contact['id']]);
+				DBA::delete('post-thread', ['author-id' => $contact['id']]);
+				DBA::delete('post-thread', ['causer-id' => $contact['id']]);
+
+				DBA::delete('post-thread-user', ['owner-id' => $contact['id']]);
+				DBA::delete('post-thread-user', ['author-id' => $contact['id']]);
+				DBA::delete('post-thread-user', ['causer-id' => $contact['id']]);
+
 				DBA::delete('contact', ['id' => $contact['id']]);
 				if ((++$count % 1000) == 0) {
 					Logger::notice('In removal', ['count' => $count, 'total' => $total]);