X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=3fe035286f3bed729a11b947d06ac3eb551d063b;hb=722aada460aa023212b7d97932fe338fe54861a8;hp=c4f4e57f29bb15f329f336350465dc0edc621601;hpb=8042119447a6a7633481f93248761d639f31da2c;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index c4f4e57f29..3fe035286f 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -23,13 +23,13 @@ namespace Friendica\Network;
 
 use DOMDocument;
 use DomXPath;
-use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\GServer;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
@@ -91,17 +91,19 @@ class Probe
 				"community", "keywords", "location", "about", "hide",
 				"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
 				"following", "followers", "inbox", "outbox", "sharedinbox",
-				"priority", "network", "pubkey", "baseurl", "gsid"];
+				"priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
+
+		$numeric_fields = ["gsid", "hide", "account-type", "manually-approve"];
 
 		$newdata = [];
 		foreach ($fields as $field) {
 			if (isset($data[$field])) {
-				if (in_array($field, ["gsid", "hide", "account-type"])) {
+				if (in_array($field, $numeric_fields)) {
 					$newdata[$field] = (int)$data[$field];
 				} else {	
 					$newdata[$field] = $data[$field];
 				}
-			} elseif ($field != "gsid") {
+			} elseif (!in_array($field, $numeric_fields)) {
 				$newdata[$field] = "";
 			} else {
 				$newdata[$field] = null;
@@ -328,13 +330,13 @@ class Probe
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function uri($uri, $network = '', $uid = -1, $cache = true)
+	public static function uri($uri, $network = '', $uid = -1)
 	{
-		$cachekey = 'Probe::uri:' . $network . ':' . $uri;
-		if ($cache) {
-			$result = DI::cache()->get($cachekey);
-			if (!is_null($result)) {
-				return $result;
+		// Local profiles aren't probed via network
+		if (empty($network) && strpos($uri, DI::baseUrl()->getHostname())) {
+			$data = self::localProbe($uri);
+			if (!empty($data)) {
+				return $data;
 			}
 		}
 
@@ -370,7 +372,7 @@ class Probe
 		}
 
 		if (empty($data['photo'])) {
-			$data['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+			$data['photo'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO;
 		}
 
 		if (empty($data['name'])) {
@@ -408,14 +410,7 @@ class Probe
 			$data['hide'] = self::getHideStatus($data['url']);
 		}
 
-		$data = self::rearrangeData($data);
-
-		// Only store into the cache if the value seems to be valid
-		if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) {
-			DI::cache()->set($cachekey, $data, Duration::DAY);
-		}
-
-		return $data;
+		return self::rearrangeData($data);
 	}
 
 
@@ -719,7 +714,14 @@ class Probe
 
 		Logger::info('Probing start', ['uri' => $uri]);
 
-		$data = self::getWebfingerArray($uri);
+		if (!empty($ap_profile['addr']) && ($ap_profile['addr'] != $uri)) {
+			$data = self::getWebfingerArray($ap_profile['addr']);
+		}
+
+		if (empty($data)) {
+			$data = self::getWebfingerArray($uri);
+		}
+
 		if (empty($data)) {
 			if (!empty($parts['scheme'])) {
 				return self::feed($uri);
@@ -1454,6 +1456,7 @@ class Probe
 			&& !empty($hcard_url)
 		) {
 			$data["network"] = Protocol::DIASPORA;
+			$data["manually-approve"] = false;
 
 			// The Diaspora handle must always be lowercase
 			if (!empty($data["addr"])) {
@@ -1544,6 +1547,7 @@ class Probe
 			&& isset($data["url"])
 		) {
 			$data["network"] = Protocol::OSTATUS;
+			$data["manually-approve"] = false;
 		} else {
 			return $short ? false : [];
 		}
@@ -2019,6 +2023,14 @@ class Probe
 	 */
 	public static function getLastUpdate(array $data)
 	{
+		$uid = User::getIdForURL($data['url']);
+		if (!empty($uid)) {
+			$contact = Contact::selectFirst(['url', 'last-item'], ['self' => true, 'uid' => $uid]);
+			if (!empty($contact['last-item'])) {
+				return $contact['last-item'];
+			}
+		}
+
 		if ($lastUpdate = self::updateFromNoScrape($data)) {
 			return $lastUpdate;
 		}
@@ -2171,4 +2183,47 @@ class Probe
 
 		return '';
 	}
+
+	/**
+	 * Probe data from local profiles without network traffic
+	 *
+	 * @param string $url
+	 * @return array probed data
+	 */
+	private static function localProbe(string $url)
+	{
+		$uid = User::getIdForURL($url);
+		if (empty($uid)) {
+			return [];
+		}
+
+		$profile = User::getOwnerDataById($uid);
+		if (empty($profile)) {
+			return [];
+		}
+
+		$approfile = ActivityPub\Transmitter::getProfile($uid);
+		if (empty($approfile)) {
+			return [];
+		}
+
+		if (empty($profile['gsid'])) {
+			$profile['gsid'] = GServer::getID($approfile['generator']['url']);
+		}
+
+		$data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
+			'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
+			'photo' => $profile['photo'], 'account-type' => $profile['contact-type'],
+			'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+			'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'], 
+			'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
+			'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
+			'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'], 
+			'following' => $approfile['following'], 'followers' => $approfile['followers'],
+			'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
+			'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN, 
+			'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
+			'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])];
+		return self::rearrangeData($data);		
+	}
 }