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

Update contact data for uid=0 at feed import

Browse source
This commit is contained in:
Michael Vogel 2016-04-02 14:10:40 +02:00 committed by Roland Haeder
parent bacece897b
commit 7158390b98
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
include/ostatus.php
View file

@ -90,13 +90,20 @@ class ostatus {
// Only update the contacts if it is an OStatus contact // Only update the contacts if it is an OStatus contact
if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) { if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) {
// Update contact data // Update contact data
$value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue; // This query doesn't seem to work
if ($value != "") // $value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue;
$contact["notify"] = $value; // if ($value != "")
// $contact["notify"] = $value;
$value = $xpath->evaluate('atom:author/uri/text()', $context)->item(0)->nodeValue; // This query doesn't seem to work as well - I hate these queries
// $value = $xpath->query("atom:link[@rel='self' and @type='application/atom+xml']", $context)->item(0)->nodeValue;
// if ($value != "")
// $contact["poll"] = $value;
$value = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
if ($value != "") if ($value != "")
$contact["alias"] = $value; $contact["alias"] = $value;
@ -136,6 +143,24 @@ class ostatus {
update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]); update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
} }
// Ensure that we are having this contact (with uid=0)
$cid = get_contact($author["author-link"], 0);
if ($cid) {
// Update it with the current values
q("UPDATE `contact` SET `url` = '%s', `name` = '%s', `nick` = '%s', `alias` = '%s',
`about` = '%s', `location` = '%s', `notify` = '%s', `poll` = '%s',
`success_update` = '%s', `last-update` = '%s'
WHERE `id` = %d",
dbesc($author["author-link"]), dbesc($contact["name"]), dbesc($contact["nick"]),
dbesc($contact["alias"]), dbesc($contact["about"]), dbesc($contact["location"]),
dbesc($contact["notify"]), dbesc($contact["poll"]),
dbesc(datetime_convert()), dbesc(datetime_convert()), intval($cid));
// Update the avatar
update_contact_avatar($author["author-avatar"], 0, $cid);
}
$contact["generation"] = 2; $contact["generation"] = 2;
$contact["photo"] = $author["author-avatar"]; $contact["photo"] = $author["author-avatar"];
update_gcontact($contact); update_gcontact($contact);
@ -1586,8 +1611,10 @@ class ostatus {
if (!isset($contact["poll"])) { if (!isset($contact["poll"])) {
$data = probe_url($url); $data = probe_url($url);
$contact["alias"] = $data["alias"];
$contact["poll"] = $data["poll"]; $contact["poll"] = $data["poll"];
if (!$contact["alias"])
$contact["alias"] = $data["alias"];
} }
if (!isset($contact["alias"])) if (!isset($contact["alias"]))