X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveContact.php;h=a84cb0d53760701f9eb9a825b5a24c22fbf3255d;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=05771e2dc5c0ee5d1e494bcb5bfc552160df8711;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php index 05771e2dc5..a84cb0d537 100644 --- a/src/Worker/RemoveContact.php +++ b/src/Worker/RemoveContact.php @@ -31,15 +31,21 @@ use Friendica\Model\Photo; */ class RemoveContact { public static function execute($id) { - // Only delete if the contact is to be deleted $contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true, 'id' => $id]); if (!DBA::isResult($contact)) { return; } + Logger::info('Start deleting contact', ['id' => $id]); // Now we delete the contact and all depending tables - $condition = ['uid' => $contact['uid'], 'contact-id' => $id]; + 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]; + } do { $items = Item::select(['id', 'guid'], $condition, ['limit' => 100]); while ($item = Item::fetch($items)) { @@ -49,7 +55,8 @@ class RemoveContact { DBA::close($items); } while (Item::exists($condition)); - Photo::delete(['uid' => $contact['uid'], 'contact-id' => $id]); - DBA::delete('contact', ['id' => $id]); + Photo::delete(['contact-id' => $id]); + $ret = DBA::delete('contact', ['id' => $id]); + Logger::info('Deleted contact', ['id' => $id, 'result' => $ret]); } }