strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases 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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/Scrape.php
View file

@ -799,6 +799,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
if (substr($baseurl, -10) == "/index.php") if (substr($baseurl, -10) == "/index.php")
$baseurl = str_replace("/index.php", "", $baseurl); $baseurl = str_replace("/index.php", "", $baseurl);
if ($network == "")
$network = NETWORK_PHANTOM;
$baseurl = rtrim($baseurl, "/"); $baseurl = rtrim($baseurl, "/");
if(strpos($url,'@') AND ($addr == "") AND ($network == NETWORK_DFRN)) if(strpos($url,'@') AND ($addr == "") AND ($network == NETWORK_DFRN))
@ -846,7 +849,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
} }
// Only store into the cache if the value seems to be valid // Only store into the cache if the value seems to be valid
if (!in_array($result['network'], array(NETWORK_PHANTOM, ""))) { if ($result['network'] != NETWORK_PHANTOM) {
Cache::set("probe_url:".$mode.":".$original_url,serialize($result), CACHE_DAY); Cache::set("probe_url:".$mode.":".$original_url,serialize($result), CACHE_DAY);
/// @todo temporary fix - we need a real contact update function that updates only changing fields /// @todo temporary fix - we need a real contact update function that updates only changing fields

21
include/socgraph.php
View file

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

2
mod/item.php
View file

@ -1147,7 +1147,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
if (!$r) { if (!$r) {
$probed = probe_url($name); $probed = probe_url($name);
if (isset($probed["url"])) { if ($result['network'] != NETWORK_PHANTOM) {
update_gcontact($probed); update_gcontact($probed);
$r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", $r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($probed["url"]))); dbesc(normalise_link($probed["url"])));