X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=0f8afcf56df813bd6ff473f9acc71121ab74c237;hb=bc92b922b45eb8da9d03f4a4d276a0ef706cf3e8;hp=0c78cfe2352457e23ae8170fcc752374d9442703;hpb=fc9c6e6bfd1cf31959d79077e701b086c5d8c713;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
index 0c78cfe235..0f8afcf56d 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -7,6 +7,8 @@ require_once("include/html2bbcode.php");
 /*
  To-Do:
  - Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
+ - Fetch profile data from profile page for Redmatrix users
+ - Detect if it is a forum
 */
 
 /*
@@ -169,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;
 
@@ -176,7 +180,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 	if (!isset($urlparts["scheme"]))
 		return $gcid;
 
-	if (in_array($urlparts["host"], array("facebook.com", "twitter.com", "www.twitter-rss.com",
+	if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
 						"identi.ca", "alpha.app.net")))
 		return $gcid;
 
@@ -203,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"];
 		}
 	}
 
@@ -219,35 +223,45 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 			$updated = $x[0]["updated"];
 
 		$created = $x[0]["created"];
-		$last_contact = $x[0]["last_contact"];
-		$last_failure = $x[0]["last_failure"];
 		$server_url = $x[0]["server_url"];
 		$nick = $x[0]["nick"];
-
-		if ($updated > $last_contact)
-			$last_contact = $updated;
 	} else {
 		$created = "0000-00-00 00:00:00";
-		$last_contact = "0000-00-00 00:00:00";
-		$last_failure = "0000-00-00 00:00:00";
 		$server_url = "";
 
 		$urlparts = parse_url($profile_url);
 		$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);
 
+		$orig_profile = $profile_url;
+
 		$network = $data["network"];
 		$name = $data["name"];
 		$nick = $data["nick"];
 		$profile_url = $data["url"];
 		$profile_photo = $data["photo"];
 		$server_url = $data["baseurl"];
+
+		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))
+		return $gcid;
+
 	if (count($x) AND ($x[0]["network"] == "") AND ($network != "")) {
 		q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
 			dbesc($network),
@@ -265,19 +279,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 
 	poco_check_server($server_url, $network);
 
-	// Fetch last update manually if it is enabled in the system
-	if (get_config('system','poco_completion') AND ($orig_updated == "0000-00-00 00:00:00")
-		AND poco_do_update($created, $updated, $last_failure, $last_contact)
-		AND poco_reachable($profile_url, $server_url, $network)) {
-		$last_updated = poco_last_updated($profile_url);
-		if ($last_updated) {
-			$updated = $last_updated;
-			$last_contact = datetime_convert();
-			logger("Last updated for profile ".$profile_url.": ".$updated, LOGGER_DEBUG);
-		} else
-			$last_failure = datetime_convert();
-	}
-
 	if(count($x)) {
 		$gcid = $x[0]['id'];
 
@@ -298,7 +299,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 
 		if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo || $x[0]['updated'] < $updated) {
 			q("UPDATE `gcontact` SET `name` = '%s', `network` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s', `server_url` = '%s',
-				`updated` = '%s', `last_contact` = '%s', `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s', `generation` = %d
+				`updated` = '%s', `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s', `generation` = %d
 				WHERE (`generation` >= %d OR `generation` = 0) AND `nurl` = '%s'",
 				dbesc($name),
 				dbesc($network),
@@ -307,7 +308,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 				dbesc($profile_url),
 				dbesc($server_url),
 				dbesc($updated),
-				dbesc($last_contact),
 				dbesc($location),
 				dbesc($about),
 				dbesc($keywords),
@@ -318,8 +318,8 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 			);
 		}
 	} else {
-		q("INSERT INTO `gcontact` (`name`, `nick`, `network`, `url`, `nurl`, `photo`, `connect`, `server_url`, `created`, `updated`, `last_contact`, `last_failure`, `location`, `about`, `keywords`, `gender`, `generation`)
-			VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+		q("INSERT INTO `gcontact` (`name`, `nick`, `network`, `url`, `nurl`, `photo`, `connect`, `server_url`, `created`, `updated`, `location`, `about`, `keywords`, `gender`, `generation`)
+			VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
 			dbesc($name),
 			dbesc($nick),
 			dbesc($network),
@@ -330,8 +330,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 			dbesc($server_url),
 			dbesc(datetime_convert()),
 			dbesc($updated),
-			dbesc($last_contact),
-			dbesc($last_failure),
 			dbesc($location),
 			dbesc($about),
 			dbesc($keywords),
@@ -425,7 +423,11 @@ function poco_detect_server($profile) {
 	return $server_url;
 }
 
-function poco_last_updated($profile) {
+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'",
 			dbesc(normalise_link($profile)));
@@ -439,9 +441,30 @@ function poco_last_updated($profile) {
 	else
 		$server_url = poco_detect_server($profile);
 
-	if ($server_url != "")
-		if (!poco_check_server($pserver_url, $gcontacts[0]["network"]))
+	if ($server_url != "") {
+		if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) {
+
+			if ($force)
+				q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
+					dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+
 			return false;
+		}
+
+		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))) {
+		$server = q("SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''",
+			dbesc(normalise_link($server_url)));
+
+		if ($server)
+			q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
+				dbesc($server[0]["network"]), dbesc(normalise_link($profile)));
+		else
+			return;
+	}
 
 	// noscrape is really fast so we don't cache the call.
 	if (($gcontacts[0]["server_url"] != "") AND ($gcontacts[0]["nick"] != "")) {
@@ -451,12 +474,14 @@ function poco_last_updated($profile) {
 
 		if ($server) {
 			$noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
-			 if ($noscraperet["success"]) {
+
+			 if ($noscraperet["success"] AND ($noscraperet["body"] != "")) {
+
 				$noscrape = json_decode($noscraperet["body"], true);
 
-				if (($noscrape["name"] != "") AND ($noscrape["name"] != $gcontacts[0]["name"]))
+				if (($noscrape["fn"] != "") AND ($noscrape["fn"] != $gcontacts[0]["name"]))
 					q("UPDATE `gcontact` SET `name` = '%s' WHERE `nurl` = '%s'",
-						dbesc($noscrape["name"]), dbesc(normalise_link($profile)));
+						dbesc($noscrape["fn"]), dbesc(normalise_link($profile)));
 
 				if (($noscrape["photo"] != "") AND ($noscrape["photo"] != $gcontacts[0]["photo"]))
 					q("UPDATE `gcontact` SET `photo` = '%s' WHERE `nurl` = '%s'",
@@ -470,10 +495,18 @@ function poco_last_updated($profile) {
 					q("UPDATE `gcontact` SET `gender` = '%s' WHERE `nurl` = '%s'",
 						dbesc($noscrape["gender"]), dbesc(normalise_link($profile)));
 
-				if (($noscrape["about"] != "") AND ($noscrape["about"] != $gcontacts[0]["name"]))
+				if (($noscrape["pdesc"] != "") AND ($noscrape["pdesc"] != $gcontacts[0]["about"]))
+					q("UPDATE `gcontact` SET `about` = '%s' WHERE `nurl` = '%s'",
+						dbesc($noscrape["pdesc"]), dbesc(normalise_link($profile)));
+
+				if (($noscrape["about"] != "") AND ($noscrape["about"] != $gcontacts[0]["about"]))
 					q("UPDATE `gcontact` SET `about` = '%s' WHERE `nurl` = '%s'",
 						dbesc($noscrape["about"]), dbesc(normalise_link($profile)));
 
+				if (isset($noscrape["comm"]) AND ($noscrape["comm"] != $gcontacts[0]["community"]))
+					q("UPDATE `gcontact` SET `community` = %d WHERE `nurl` = '%s'",
+						intval($noscrape["comm"]), dbesc(normalise_link($profile)));
+
 				if (isset($noscrape["tags"]))
 					$keywords = implode(" ", $noscrape["tags"]);
 				else
@@ -514,11 +547,29 @@ function poco_last_updated($profile) {
 	}
 
 	// If we only can poll the feed, then we only do this once a while
-	if (!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"]))
 		return $gcontacts[0]["updated"];
 
 	$data = probe_url($profile);
 
+	// Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711)
+	// 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"]);
+
+		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)));
@@ -678,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;
@@ -1174,7 +1225,7 @@ function update_suggestions() {
 	$done[] = $a->get_baseurl() . '/poco';
 
 	if(strlen(get_config('system','directory_submit_url'))) {
-		$x = fetch_url('http://dir.friendica.com/pubsites');
+		$x = fetch_url(get_server()."/pubsites");
 		if($x) {
 			$j = json_decode($x);
 			if($j->entries) {
@@ -1211,7 +1262,7 @@ function poco_discover($complete = false) {
 	$last_update = date("c", time() - (60 * 60 * 6)); // 24
 	$last_update = date("c", time() - (60 * 60 * 24)); // 24
 
-	$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `last_contact` > `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
+	$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
 	if ($r)
 		foreach ($r AS $server) {