X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveContact.php;h=28a32160a014c7c830f5f5d5fb71952701792030;hb=d4f7bfa676bc9a8ffcb304912b48b360453d0f3c;hp=01388516bc5e199f041188c1869a23e87866cc7a;hpb=29aa90ec097ee42ff0b2265eb763731b99088cb3;p=friendica.git

diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index 01388516bc..28a32160a0 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -1,25 +1,54 @@
 <?php
 /**
- * @file src/Worker/RemoveContact.php
- * @brief Removes orphaned data from deleted contacts
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Worker;
 
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\Core\Protocol;
+use Friendica\Model\Item;
 
-require_once 'include/dba.php';
-
+/**
+ * Removes orphaned data from deleted contacts
+ */
 class RemoveContact {
 	public static function execute($id) {
 
-		// Only delete if the contact is archived
-		$condition = ['archive' => true, 'network' => Protocol::PHANTOM, 'id' => $id];
-		$r = DBA::exists('contact', $condition);
-		if (!DBA::isResult($r)) {
+		// Only delete if the contact is to be deleted
+		$contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true]);
+		if (!DBA::isResult($contact)) {
 			return;
 		}
 
 		// Now we delete the contact and all depending tables
+		$condition = ['uid' => $contact['uid'], 'contact-id' => $id];
+		do {
+			$items = Item::select(['id', 'guid'], $condition, ['limit' => 100]);
+			while ($item = Item::fetch($items)) {
+				Logger::info('Delete removed contact item', ['id' => $item['id'], 'guid' => $item['guid']]);
+				DBA::delete('item', ['id' => $item['id']]);
+			}
+			DBA::close($items);
+		} while (Item::exists($condition));
+
 		DBA::delete('contact', ['id' => $id]);
 	}
 }