Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 15:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6224 from annando/dba-delete-contact

Browse source 
Avoid duplicated contacts, improve contact deletion, avoid memory issues
This commit is contained in:
Hypolite Petovan 2018-12-02 16:16:59 -05:00 • committed by GitHub
commit c5558cc459
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Model/Contact.php
View file

@ -1147,7 +1147,7 @@ class Contact extends BaseObject
$url = $data["url"];
if (!$contact_id) {
DBA::insert('contact', [
$fields = [
'uid' => $uid,
'created' => DateTimeFormat::utcNow(),
'url' => $data["url"],
@ -1176,10 +1176,13 @@ class Contact extends BaseObject
'writable' => 1,
'blocked' => 0,
'readonly' => 0,
'pending' => 0]
);
'pending' => 0];
$s = DBA::select('contact', ['id'], ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
$condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
DBA::update('contact', $fields, $condition, true);
$s = DBA::select('contact', ['id'], $condition, ['order' => ['id'], 'limit' => 2]);
$contacts = DBA::toArray($s);
if (!DBA::isResult($contacts)) {
return 0;
@ -1204,8 +1207,10 @@ class Contact extends BaseObject
}
if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
Strings::normaliseLink($data["url"]), $contact_id]);
$condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self`",
Strings::normaliseLink($data["url"]), 0, $contact_id];
Logger::log('Deleting duplicate contact ' . json_encode($condition), Logger::DEBUG);
DBA::delete('contact', $condition);
}
}