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

Some more checks that the gcontact table contains valid data

Browse source
This commit is contained in:
Michael Vogel 2016-04-20 07:00:55 +02:00
parent 1dd73dce80
commit 28f97845ca
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/socgraph.php
View file

@ -1377,6 +1377,17 @@ function clean_contact_url($url) {
return $new_url;
}
function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($contact["url"])) {
$data = probe_url($contact["url"]);
if (!in_array($contact["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
$contact["url"] = $data["url"];
$contact["addr"] = $data["addr"];
$contact["server_url"] = $data["baseurl"];
}
}
}
/**
* @brief Fetch the gcontact id, add an entry if not existed
*
@ -1387,12 +1398,15 @@ function get_gcontact_id($contact) {
$gcontact_id = 0;
if ($contact["network"] == NETWORK_PHANTOM)
if (in_array($contact["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
return false;
if ($contact["network"] == NETWORK_STATUSNET)
$contact["network"] = NETWORK_OSTATUS;
// Replace alternate OStatus user format with the primary one
fix_alternate_contact_address($contact);
// Remove unwanted parts from the contact url (e.g. "?zrl=...")
$contact["url"] = clean_contact_url($contact["url"]);
@ -1477,6 +1491,9 @@ function update_gcontact($contact) {
if ($contact["network"] == NETWORK_STATUSNET)
$contact["network"] = NETWORK_OSTATUS;
// Replace alternate OStatus user format with the primary one
fix_alternate_contact_address($contact);
if (!isset($contact["updated"]))
$contact["updated"] = datetime_convert();
@ -1571,7 +1588,7 @@ function update_gcontact($contact) {
function update_gcontact_from_probe($url) {
$data = probe_url($url);
if ($data["network"] == NETWORK_PHANTOM)
if (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
return;
update_gcontact($data);