nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4505 from annando/update-avatar

Browse source 
Contact updates should now work more reliable
This commit is contained in:
Hypolite Petovan 2018-02-26 17:40:01 -05:00 committed by GitHub
commit 16a55a021c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Contact.php
View file

@ -1032,7 +1032,7 @@ class Contact extends BaseObject
// Update the public contact (contact id = 0)
if ($uid != 0) {
$pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl']]);
$pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
if (DBM::is_result($pcontact)) {
self::updateAvatar($avatar, 0, $pcontact['id'], $force);
}

15
src/Protocol/DFRN.php
View file

@ -1431,7 +1431,7 @@ class DFRN
$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
$contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
$contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `avatar`, `name-date`, `uri-date`, `addr`,
`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
FROM `contact` WHERE `uid` = ? AND `nurl` = ? AND `network` != ?",
$importer["uid"],
@ -1468,7 +1468,7 @@ class DFRN
$width = $attributes->textContent;
}
if ($attributes->name == "updated") {
$contact_old["avatar-date"] = $attributes->textContent;
$author["avatar-date"] = $attributes->textContent;
}
}
if (($width > 0) && ($href != "")) {
@ -1601,6 +1601,7 @@ class DFRN
unset($fields["uid"]);
unset($fields["url"]);
unset($fields["avatar-date"]);
unset($fields["avatar"]);
unset($fields["name-date"]);
unset($fields["uri-date"]);
@ -1638,10 +1639,10 @@ class DFRN
}
Contact::updateAvatar(
$author["avatar"],
$importer["uid"],
$contact["id"],
(strtotime($contact["avatar-date"]) > strtotime($contact_old["avatar-date"]))
$author['avatar'],
$importer['uid'],
$contact['id'],
(strtotime($contact['avatar-date']) > strtotime($contact_old['avatar-date']) || ($author['avatar'] != $contact_old['avatar']))
);
/*
@ -1660,7 +1661,7 @@ class DFRN
GContact::link($gcid, $importer["uid"], $contact["id"]);
}
return($author);
return $author;
}
/**