friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #8861 from annando/fix-empty-network 

Fix message "empty network" in gcontact::getid
This commit is contained in:
Hypolite Petovan 2020-07-10 16:08:43 -04:00 committed by GitHub
parent 42a3f278f8 84d8753d5f
commit 52b2f67644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Model/GContact.php
View File

@ -609,8 +609,6 @@ class GContact
*/
public static function getId($contact)
{
$gcontact_id = 0;
if (empty($contact['network'])) {
Logger::notice('Empty network', ['url' => $contact['url'], 'callstack' => System::callstack()]);
return false;
@ -630,12 +628,12 @@ class GContact
$contact['url'] = self::cleanContactUrl($contact['url']);
}
DBA::lock('gcontact');
$fields = ['id', 'last_contact', 'last_failure', 'network'];
$gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
if (DBA::isResult($gcnt)) {
$gcontact_id = $gcnt['id'];
} else {
$condition = ['nurl' => Strings::normaliseLink($contact['url'])];
$gcontact = DBA::selectFirst('gcontact', ['id'], $condition, ['order' => ['id']]);
if (DBA::isResult($gcontact)) {
return $gcontact['id'];
}
$contact['location'] = $contact['location'] ?? '';
$contact['about'] = $contact['about'] ?? '';
$contact['generation'] = $contact['generation'] ?? 0;
@ -648,15 +646,14 @@ class GContact
DBA::insert('gcontact', $fields);
$condition = ['nurl' => Strings::normaliseLink($contact['url'])];
$cnt = DBA::selectFirst('gcontact', ['id', 'network'], $condition, ['order' => ['id']]);
if (DBA::isResult($cnt)) {
$gcontact_id = $cnt['id'];
// We intentionally aren't using lastInsertId here. There is a chance for duplicates.
$gcontact = DBA::selectFirst('gcontact', ['id'], $condition, ['order' => ['id']]);
if (!DBA::isResult($gcontact)) {
Logger::info('GContact creation failed', $fields);
// Shouldn't happen
return 0;
}
}
DBA::unlock();
return $gcontact_id;
return $gcontact['id'];
}
/**

2
src/Protocol/DFRN.php
View File

@ -1560,7 +1560,7 @@ class DFRN
if (DBA::isResult($contact_old) && !$onlyfetch) {
Logger::log("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", Logger::DEBUG);
$poco = ["url" => $contact_old["url"]];
$poco = ["url" => $contact_old["url"], "network" => $contact_old["network"]];
// When was the last change to name or uri?
$name_element = $xpath->query($element . "/atom:name", $context)->item(0);