Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 21:04:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Renamed function

Browse source
This commit is contained in:
Michael Vogel 2019-08-30 07:52:21 +02:00
parent 438394bc1d
commit 3b92f7357c
2 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Model/Contact.php
View file

@ -156,7 +156,7 @@ class Contact extends BaseObject
}
// Search for duplicated contacts and get rid of them
self::handleDuplicates($contact['nurl'], $contact['uid']);
self::removeDuplicates($contact['nurl'], $contact['uid']);
return $ret;
}
@ -1880,7 +1880,7 @@ class Contact extends BaseObject
}
// Search for duplicated contacts and get rid of them
if (self::handleDuplicates(Strings::normaliseLink($url), $uid) || ($uid != 0)) {
if (self::removeDuplicates(Strings::normaliseLink($url), $uid) || ($uid != 0)) {
return;
}
@ -1921,34 +1921,15 @@ class Contact extends BaseObject
DBA::update('contact', $fields, $condition);
}
/**
* Check and remove duplicate contact entries
*
* @param integer $contact_id Contact ID
* @throws \Exception
*/
public static function handleDuplicateByID(int $contact_id)
{
$contact = DBA::selectFirst('contact', ['nurl', 'uid'], ['id' => $contact_id, 'deleted' => false]);
if (!DBA::isResult($contact)) {
return;
}
// Search for duplicated contacts and get rid of them
self::handleDuplicates($contact['nurl'], $contact['uid']);
return;
}
/**
* @brief Helper function for "updateFromProbe". Remove duplicated contacts
* @brief Remove duplicated contacts
*
* @param string $nurl Normalised contact url
* @param integer $uid User id
* @return boolean
* @throws \Exception
*/
private static function handleDuplicates(string $nurl, int $uid)
public static function removeDuplicates(string $nurl, int $uid)
{
$condition = ['nurl' => $nurl, 'uid' => $uid, 'deleted' => false, 'network' => Protocol::FEDERATED];
$count = DBA::count('contact', $condition);