keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5607 from annando/remove-contact

Browse source 
Remove contacts in the background
This commit is contained in:
Tobias Diekershoff 2018-08-13 06:42:08 +02:00 committed by GitHub
commit 1ca8d573e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Model/Contact.php
View file

@ -314,15 +314,10 @@ class Contact extends BaseObject
return; return;
} }
$archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts'); // Archive the contact
if ($archive) { DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]);
DBA::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
return;
}
DBA::delete('contact', ['id' => $id]); // Delete it in the background
// Delete the rest in the background
Worker::add(PRIORITY_LOW, 'RemoveContact', $id); Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
} }

9
src/Worker/RemoveContact.php
View file

@ -12,13 +12,14 @@ require_once 'include/dba.php';
class RemoveContact { class RemoveContact {
public static function execute($id) { public static function execute($id) {
// Only delete if the contact doesn't exist (anymore) // Only delete if the contact is archived
$r = DBA::exists('contact', ['id' => $id]); $condition = ['archive' => true, 'network' => Protocol::PHANTOM, 'id' => $id];
if ($r) { $r = DBA::exists('contact', $condition);
if (!DBA::isResult($r)) {
return; return;
} }
// Now we delete all the depending table entries // Now we delete the contact and all depending tables
DBA::delete('contact', ['id' => $id]); DBA::delete('contact', ['id' => $id]);
} }
} }