nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

poco_last_updated is optimized

Browse source
This commit is contained in:
Michael 2017-03-23 22:56:22 +00:00
parent 2ce5ab1467
commit b7242c3fa0
1 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
include/socgraph.php
View file

@ -252,6 +252,9 @@ function sanitized_gcontact(&$gcontact) {
} }
} }
$gcontact['server_url'] = '';
$gcontact['network'] = '';
$x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", $x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($gcontact['url'])) dbesc(normalise_link($gcontact['url']))
); );
@ -263,19 +266,12 @@ function sanitized_gcontact(&$gcontact) {
if ($gcontact['updated'] <= NULL_DATE) { if ($gcontact['updated'] <= NULL_DATE) {
$gcontact['updated'] = $x[0]["updated"]; $gcontact['updated'] = $x[0]["updated"];
} }
if (!isset($gcontact['server_url'])) { if (!isset($gcontact['server_url']) AND (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) {
$gcontact['server_url'] = $x[0]["server_url"]; $gcontact['server_url'] = $x[0]["server_url"];
} }
if (!isset($gcontact['addr'])) { if (!isset($gcontact['addr'])) {
$gcontact['addr'] = $x[0]["addr"]; $gcontact['addr'] = $x[0]["addr"];
} }
} else {
if (!isset($gcontact['server_url'])) {
$gcontact['server_url'] = '';
}
if (!isset($gcontact['network'])) {
$gcontact['network'] = '';
}
} }
if ((!isset($gcontact['network']) OR !isset($gcontact['name']) OR !isset($gcontact['addr']) OR !isset($gcontact['photo']) OR !isset($gcontact['server_url']) OR $alternate) if ((!isset($gcontact['network']) OR !isset($gcontact['name']) OR !isset($gcontact['addr']) OR !isset($gcontact['photo']) OR !isset($gcontact['server_url']) OR $alternate)
@ -463,15 +459,26 @@ function poco_last_updated($profile, $force = false) {
$gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'", $gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
dbesc(normalise_link($profile))); dbesc(normalise_link($profile)));
if ($gcontacts[0]["created"] <= NULL_DATE) { if (!dbm::is_result($gcontacts)) {
q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'", return false;
dbesc(datetime_convert()), dbesc(normalise_link($profile)));
} }
if ($gcontacts[0]["server_url"] != "") {
$contact = array("url" => $profile);
if ($gcontacts[0]["created"] <= NULL_DATE) {
$contact['created'] = datetime_convert();
}
if ($force) {
$server_url = normalise_link(poco_detect_server($profile));
}
if (($server_url == '') AND ($gcontacts[0]["server_url"] != "")) {
$server_url = $gcontacts[0]["server_url"]; $server_url = $gcontacts[0]["server_url"];
} }
if (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"])) {
$server_url = poco_detect_server($profile); if (!$force AND (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) {
$server_url = normalise_link(poco_detect_server($profile));
} }
if (!in_array($gcontacts[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS, ""))) { if (!in_array($gcontacts[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS, ""))) {
@ -481,35 +488,33 @@ function poco_last_updated($profile, $force = false) {
if ($server_url != "") { if ($server_url != "") {
if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) { if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) {
if ($force) {
if ($force)
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)));
}
logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG); logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG);
return false; return false;
} }
$contact['server_url'] = $server_url;
q("UPDATE `gcontact` SET `server_url` = '%s' WHERE `nurl` = '%s'",
dbesc($server_url), dbesc(normalise_link($profile)));
} }
if (in_array($gcontacts[0]["network"], array("", NETWORK_FEED))) { if (in_array($gcontacts[0]["network"], array("", NETWORK_FEED))) {
$server = q("SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''", $server = q("SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''",
dbesc(normalise_link($server_url))); dbesc(normalise_link($server_url)));
if ($server) if ($server) {
q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'", $contact['network'] = $server[0]["network"];
dbesc($server[0]["network"]), dbesc(normalise_link($profile))); } else {
else
return false; return false;
} }
}
// noscrape is really fast so we don't cache the call. // noscrape is really fast so we don't cache the call.
if (($gcontacts[0]["server_url"] != "") AND ($gcontacts[0]["nick"] != "")) { if (($server_url != "") AND ($gcontacts[0]["nick"] != "")) {
// Use noscrape if possible // Use noscrape if possible
$server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($gcontacts[0]["server_url"]))); $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url)));
if ($server) { if ($server) {
$noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]); $noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
@ -519,29 +524,28 @@ function poco_last_updated($profile, $force = false) {
$noscrape = json_decode($noscraperet["body"], true); $noscrape = json_decode($noscraperet["body"], true);
if (is_array($noscrape)) { if (is_array($noscrape)) {
$contact = array("url" => $profile, $contact["network"] = $server[0]["network"];
"network" => $server[0]["network"],
"generation" => $gcontacts[0]["generation"]);
if (isset($noscrape["fn"])) if (isset($noscrape["fn"])) {
$contact["name"] = $noscrape["fn"]; $contact["name"] = $noscrape["fn"];
}
if (isset($noscrape["comm"])) if (isset($noscrape["comm"])) {
$contact["community"] = $noscrape["comm"]; $contact["community"] = $noscrape["comm"];
}
if (isset($noscrape["tags"])) { if (isset($noscrape["tags"])) {
$keywords = implode(" ", $noscrape["tags"]); $keywords = implode(" ", $noscrape["tags"]);
if ($keywords != "") if ($keywords != "") {
$contact["keywords"] = $keywords; $contact["keywords"] = $keywords;
} }
}
$location = formatted_location($noscrape); $location = formatted_location($noscrape);
if ($location) if ($location) {
$contact["location"] = $location; $contact["location"] = $location;
}
if (isset($noscrape["dfrn-notify"])) if (isset($noscrape["dfrn-notify"])) {
$contact["notify"] = $noscrape["dfrn-notify"]; $contact["notify"] = $noscrape["dfrn-notify"];
}
// Remove all fields that are not present in the gcontact table // Remove all fields that are not present in the gcontact table
unset($noscrape["fn"]); unset($noscrape["fn"]);
unset($noscrape["key"]); unset($noscrape["key"]);
@ -581,6 +585,8 @@ function poco_last_updated($profile, $force = false) {
// If we only can poll the feed, then we only do this once a while // If we only can poll the feed, then we only do this once a while
if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) { if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) {
logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG); logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG);
update_gcontact($contact);
return $gcontacts[0]["updated"]; return $gcontacts[0]["updated"];
} }
@ -618,8 +624,6 @@ function poco_last_updated($profile, $force = false) {
return false; return false;
} }
$contact = array("generation" => $gcontacts[0]["generation"]);
$contact = array_merge($contact, $data); $contact = array_merge($contact, $data);
$contact["server_url"] = $data["baseurl"]; $contact["server_url"] = $data["baseurl"];
@ -666,9 +670,10 @@ function poco_last_updated($profile, $force = false) {
q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'", q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile))); dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile)));
if (($gcontacts[0]["generation"] == 0)) if (($gcontacts[0]["generation"] == 0)) {
q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'", q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'",
dbesc(normalise_link($profile))); dbesc(normalise_link($profile)));
}
logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG); logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG);