X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveContact.php;h=f64d4d02d537fd74c7a0c1cf3ceaa89d2c2daca4;hb=2647514603852fe5fb9f47f0bf153dd20c124ce6;hp=1d60b5476dee70d96d2139203bd58f8ede4af886;hpb=c247d5fbebc2c7ded8305d97a911fef6672ec27a;p=friendica.git

diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index 1d60b5476d..f64d4d02d5 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.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
  *
@@ -37,35 +37,26 @@ class RemoveContact {
 		}
 
 		// Only delete if the contact is to be deleted
-		$contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true, 'id' => $id]);
+		$contact = DBA::selectFirst('contact', ['id', 'uid', 'url', 'nick', 'name'], ['deleted' => true, 'id' => $id]);
 		if (!DBA::isResult($contact)) {
 			return;
 		}
 
-		Logger::info('Start deleting contact', ['id' => $id]);
+		Logger::info('Start deleting contact', ['contact' => $contact]);
+
 		// Now we delete the contact and all depending tables
-		if ($contact['uid'] == 0) {
-			DBA::delete('post-tag', ['cid' => $id]);
-			$condition = ["`author-id` = ? OR `owner-id` = ? OR `causer-id` = ? OR `contact-id` = ?",
-				$id, $id, $id, $id];
-		} else {
-			$condition = ['uid' => $contact['uid'], 'contact-id' => $id];
-		}
+		DBA::delete('post-tag', ['cid' => $id]);
+
 		if (DBStructure::existsTable('item')) {
-			do {
-				$items = Post::select(['uri-id', 'guid', 'uid'], $condition, ['limit' => 100]);
-				while ($item = Post::fetch($items)) {
-					Logger::info('Delete removed contact item', ['uri-id' => $item['uri-id'], 'uid', 'guid' => $item['guid']]);
-					DBA::delete('item', ['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
-				}
-				DBA::close($items);
-			} while (Post::exists($condition));
+			DBA::delete('item', ['author-id' => $id]);
+			DBA::delete('item', ['owner-id' => $id]);
+			DBA::delete('item', ['causer-id' => $id]);
+			DBA::delete('item', ['contact-id' => $id]);
 		}
 
-		Post\User::delete(['author-id' => $id]);
-		Post\User::delete(['owner-id' => $id]);
-		Post\User::delete(['causer-id' => $id]);
-		Post\User::delete(['contact-id' => $id]);
+		DBA::delete('mail', ['contact-id' => $id]);
+		DBA::delete('mail', ['author-id' => $id]);
+
 		Post\ThreadUser::delete(['author-id' => $id]);
 		Post\ThreadUser::delete(['owner-id' => $id]);
 		Post\ThreadUser::delete(['causer-id' => $id]);
@@ -73,6 +64,10 @@ class RemoveContact {
 		Post\Thread::delete(['author-id' => $id]);
 		Post\Thread::delete(['owner-id' => $id]);
 		Post\Thread::delete(['causer-id' => $id]);
+		Post\User::delete(['author-id' => $id]);
+		Post\User::delete(['owner-id' => $id]);
+		Post\User::delete(['causer-id' => $id]);
+		Post\User::delete(['contact-id' => $id]);
 		Post::delete(['author-id' => $id]);
 		Post::delete(['owner-id' => $id]);
 		Post::delete(['causer-id' => $id]);