friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Movew the alternate OStatus profile link into the regular one

This commit is contained in:
Michael Vogel 2015-08-24 14:23:30 +02:00
parent 109620ae99
commit 2d589a7d0c
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/socgraph.php
View File

@ -453,7 +453,7 @@ function poco_last_updated($profile, $force = false) {
$noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]); $noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
if ($noscraperet["success"] AND ($noscraperet["body"] != "")) { if ($noscraperet["success"] AND ($noscraperet["body"] != "")) {
;
$noscrape = json_decode($noscraperet["body"], true); $noscrape = json_decode($noscraperet["body"], true);
if (($noscrape["fn"] != "") AND ($noscrape["fn"] != $gcontacts[0]["name"])) if (($noscrape["fn"] != "") AND ($noscrape["fn"] != $gcontacts[0]["name"]))
@ -529,6 +529,22 @@ function poco_last_updated($profile, $force = false) {
$data = probe_url($profile); $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)) { if (($data["poll"] == "") OR ($data["network"] == NETWORK_FEED)) {
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
dbesc(datetime_convert()), dbesc(normalise_link($profile))); dbesc(datetime_convert()), dbesc(normalise_link($profile)));