From 2d589a7d0cf9275224d53c1067cce35ad6ea7c43 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 24 Aug 2015 14:23:30 +0200 Subject: [PATCH 1/4] Movew the alternate OStatus profile link into the regular one --- include/socgraph.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index c6c4f5ea8e..1477c2f207 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -453,7 +453,7 @@ function poco_last_updated($profile, $force = false) { $noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]); if ($noscraperet["success"] AND ($noscraperet["body"] != "")) { -; + $noscrape = json_decode($noscraperet["body"], true); if (($noscrape["fn"] != "") AND ($noscrape["fn"] != $gcontacts[0]["name"])) @@ -529,6 +529,22 @@ function poco_last_updated($profile, $force = false) { $data = probe_url($profile); + // Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711) + // Then check the other link and mark this one as a failure + if (($data["network"] == NETWORK_OSTATUS) AND + (normalise_link($profile) == normalise_link($data["alias"])) AND + (normalise_link($profile) != normalise_link($data["url"]))) { + poco_check($data["url"], $data["name"], $data["network"], $data["photo"], $gcontacts[0]["about"], $gcontacts[0]["location"], + $gcontacts[0]["gender"], $gcontacts[0]["keywords"], $data["addr"], $gcontacts[0]["updated"], $gcontacts[0]["generation"]); + + q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", + dbesc(datetime_convert()), dbesc(normalise_link($profile))); + + poco_last_updated($data["url"], $force); + + return false; + } + if (($data["poll"] == "") OR ($data["network"] == NETWORK_FEED)) { q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc(normalise_link($profile))); From 98cd37438f3608ba8c357be2df1618e694b2116b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 24 Aug 2015 16:35:05 +0200 Subject: [PATCH 2/4] Delete the old OStatus entries --- include/socgraph.php | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index 1477c2f207..b467695a8f 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -171,6 +171,8 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca $gcid = ""; + $alternate = poco_alternate_ostatus_url($profile_url); + if ($profile_url == "") return $gcid; @@ -231,7 +233,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca $nick = end(explode("/", $urlparts["path"])); } - if ((($network == "") OR ($name == "") OR ($profile_photo == "") OR ($server_url == "")) + if ((($network == "") OR ($name == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate) AND poco_reachable($profile_url, $server_url, $network, true)) { $data = probe_url($profile_url); @@ -241,8 +243,14 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca $profile_url = $data["url"]; $profile_photo = $data["photo"]; $server_url = $data["baseurl"]; + + if ($alternate AND ($network == NETWORK_OSTATUS)) + poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid); } + if ($alternate AND ($network == NETWORK_OSTATUS)) + return $gcid; + if (count($x) AND ($x[0]["network"] == "") AND ($network != "")) { q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'", dbesc($network), @@ -404,6 +412,10 @@ function poco_detect_server($profile) { return $server_url; } +function poco_alternate_ostatus_url($url) { + return(preg_match("=https?://.+/user/\d+=ism", $url, $matches)); +} + function poco_last_updated($profile, $force = false) { $gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'", @@ -530,17 +542,19 @@ function poco_last_updated($profile, $force = false) { $data = probe_url($profile); // Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711) - // Then check the other link and mark this one as a failure - if (($data["network"] == NETWORK_OSTATUS) AND + // Then check the other link and delete this one + if (($data["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($profile) AND (normalise_link($profile) == normalise_link($data["alias"])) AND (normalise_link($profile) != normalise_link($data["url"]))) { + + // Delete the old entry + q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profile))); + q("DELETE FROM `glink` WHERE `gcid` = %d", intval($gcontacts[0]["id"])); + poco_check($data["url"], $data["name"], $data["network"], $data["photo"], $gcontacts[0]["about"], $gcontacts[0]["location"], $gcontacts[0]["gender"], $gcontacts[0]["keywords"], $data["addr"], $gcontacts[0]["updated"], $gcontacts[0]["generation"]); - q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", - dbesc(datetime_convert()), dbesc(normalise_link($profile))); - - poco_last_updated($data["url"], $force); + poco_last_updated($data["url"], $force); return false; } From 2fe6156d545392a5fb310bb6355b5e4e2db9f88e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 24 Aug 2015 18:36:13 +0200 Subject: [PATCH 3/4] Delete the alternate OStatus profile url if present. --- include/socgraph.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index b467695a8f..9689d83fba 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -237,6 +237,8 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca AND poco_reachable($profile_url, $server_url, $network, true)) { $data = probe_url($profile_url); + $orig_profile = $profile_url; + $network = $data["network"]; $name = $data["name"]; $nick = $data["nick"]; @@ -244,8 +246,17 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca $profile_photo = $data["photo"]; $server_url = $data["baseurl"]; - if ($alternate AND ($network == NETWORK_OSTATUS)) + if ($alternate AND ($network == NETWORK_OSTATUS)) { + // Delete the old entry - if it exists + $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile))); + if ($r) { + q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile))); + q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"])); + } + + // possibly create a new entry poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid); + } } if ($alternate AND ($network == NETWORK_OSTATUS)) From 5c084b754a765eeb30c95e8a215261b5f9e2fb2c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 25 Aug 2015 05:31:21 +0200 Subject: [PATCH 4/4] Don't show the alternate url syntax in searches --- include/socgraph.php | 4 ++-- mod/dirfind.php | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index 9689d83fba..0f8afcf56d 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -207,7 +207,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca ); if(count($r)) { $network = $r[0]["network"]; - $profile_url = $r[0]["url"]; + //$profile_url = $r[0]["url"]; } } @@ -729,7 +729,7 @@ function poco_check_server($server_url, $network = "", $force = false) { $last_contact = "0000-00-00 00:00:00"; $last_failure = "0000-00-00 00:00:00"; } - logger("Server ".$server_url." is unknown. Start discovery.", LOGGER_DEBUG); + logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$servers[0]["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG); $failure = false; $orig_last_failure = $last_failure; diff --git a/mod/dirfind.php b/mod/dirfind.php index 3cee6c1330..2295b3772f 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -1,9 +1,9 @@ page,'aside')) $a->page['aside'] = ''; @@ -76,6 +76,9 @@ function dirfind_content(&$a, $prefix = "") { $j->items_page = $perpage; $j->page = $a->pager['page']; foreach ($results AS $result) { + if (poco_alternate_ostatus_url($result["url"])) + continue; + if ($result["name"] == "") { $urlparts = parse_url($result["url"]); $result["name"] = end(explode("/", $urlparts["path"]));