X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=920dac47e6771911002a8fefc4f9546855cdc388;hb=a98957eeb29cfb142dfc4cd3e03c5bdfbc373466;hp=b1f4f233a63153e3b5f4701f02641393916a8703;hpb=5f43f56f7205d61b5bd867ff6c984636893187f2;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index b1f4f233a6..920dac47e6 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -30,9 +30,9 @@ 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;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -177,7 +177,7 @@ class Probe
 				$host_url = $host;
 			}
 		} elseif ($curlResult->isTimeout()) {
-			Logger::info('Probing timeout', ['url' => $ssl_url], Logger::DEBUG);
+			Logger::info('Probing timeout', ['url' => $ssl_url]);
 			self::$istimeout = true;
 			return [];
 		}
@@ -186,7 +186,7 @@ class Probe
 			$curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
-				Logger::info('Probing timeout', ['url' => $url], Logger::DEBUG);
+				Logger::info('Probing timeout', ['url' => $url]);
 				self::$istimeout = true;
 				return [];
 			} elseif ($connection_error && $ssl_connection_error) {
@@ -199,13 +199,13 @@ class Probe
 			$host_url = 'http://'.$host;
 		}
 		if (!is_object($xrd)) {
-			Logger::log("No xrd object found for ".$host, Logger::DEBUG);
+			Logger::info('No xrd object found', ['host' => $host]);
 			return [];
 		}
 
 		$links = XML::elementToArray($xrd);
 		if (!isset($links["xrd"]["link"])) {
-			Logger::log("No xrd data found for ".$host, Logger::DEBUG);
+			Logger::info('No xrd data found', ['host' => $host]);
 			return [];
 		}
 
@@ -229,7 +229,7 @@ class Probe
 
 		self::$baseurl = $host_url;
 
-		Logger::log("Probing successful for ".$host, Logger::DEBUG);
+		Logger::info('Probing successful', ['host' => $host]);
 
 		return $lrdd;
 	}
@@ -260,7 +260,7 @@ class Probe
 		$profile_link = '';
 
 		$links = self::lrdd($webbie);
-		Logger::log('webfingerDfrn: '.$webbie.':'.print_r($links, true), Logger::DATA);
+		Logger::debug('Result', ['url' => $webbie, 'links' => $links]);
 		if (!empty($links) && is_array($links)) {
 			foreach ($links as $link) {
 				if ($link['@attributes']['rel'] === ActivityNamespace::DFRN) {
@@ -294,7 +294,7 @@ class Probe
 		$webfinger = $data['webfinger'];
 
 		if (empty($webfinger["links"])) {
-			Logger::log("No webfinger links found for ".$uri, Logger::DEBUG);
+			Logger::info('No webfinger links found', ['uri' => $uri]);
 			return [];
 		}
 
@@ -341,28 +341,27 @@ class Probe
 			$uid = local_user();
 		}
 
+		if (empty($network) || ($network == Protocol::ACTIVITYPUB)) {
+			$ap_profile = ActivityPub::probeProfile($uri);
+		} else {
+			$ap_profile = [];
+		}
+
 		self::$istimeout = false;
 
 		if ($network != Protocol::ACTIVITYPUB) {
-			$data = self::detect($uri, $network, $uid);
+			$data = self::detect($uri, $network, $uid, $ap_profile);
 			if (!is_array($data)) {
 				$data = [];
 			}
-		} else {
-			$data = [];
-		}
-
-		// When the previous detection process had got a time out
-		// we could falsely detect a Friendica profile as AP profile.
-		if (!self::$istimeout && (empty($network) || $network == Protocol::ACTIVITYPUB)) {
-			$ap_profile = ActivityPub::probeProfile($uri, !$cache);
-
 			if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') != Protocol::DFRN))) {
 				$data = $ap_profile;
 			} elseif (!empty($ap_profile)) {
 				$ap_profile['batch'] = '';
 				$data = array_merge($ap_profile, $data);
 			}
+		} else {
+			$data = $ap_profile;
 		}
 
 		if (!isset($data['url'])) {
@@ -663,14 +662,15 @@ class Probe
 	 *
 	 * This function is only called by the "uri" function that adds caching and rearranging of data.
 	 *
-	 * @param string  $uri     Address that should be probed
-	 * @param string  $network Test for this specific network
-	 * @param integer $uid     User ID for the probe (only used for mails)
+	 * @param string  $uri        Address that should be probed
+	 * @param string  $network    Test for this specific network
+	 * @param integer $uid        User ID for the probe (only used for mails)
+	 * @param array   $ap_profile Previously probed AP profile
 	 *
 	 * @return array uri data
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private static function detect($uri, $network, $uid)
+	private static function detect(string $uri, string $network, int $uid, array $ap_profile)
 	{
 		$hookData = [
 			'uri'     => $uri,
@@ -692,7 +692,7 @@ class Probe
 		$parts = parse_url($uri);
 
 		if (!empty($parts['scheme']) && !empty($parts['host'])) {
-			if ($parts['host'] == 'twitter.com') {
+			if (in_array($parts['host'], ['twitter.com', 'mobile.twitter.com'])) {
 				return self::twitter($uri);
 			}
 		} elseif (strstr($uri, '@')) {
@@ -706,7 +706,9 @@ class Probe
 				return self::mail($uri, $uid);
 			}
 
-			if (strpos($uri, '@twitter.com')) {
+			if (Strings::endsWith($uri, '@twitter.com')
+				|| Strings::endsWith($uri, '@mobile.twitter.com')
+			) {
 				return self::twitter($uri);
 			}
 		} else {
@@ -749,7 +751,7 @@ class Probe
 		if ((!$result && ($network == "")) || ($network == Protocol::PUMPIO)) {
 			$result = self::pumpio($webfinger, $addr);
 		}
-		if ((!$result && ($network == "")) || ($network == Protocol::FEED)) {
+		if (empty($result['network']) && empty($ap_profile['network']) || ($network == Protocol::FEED)) {
 			$result = self::feed($uri);
 		} else {
 			// We overwrite the detected nick with our try if the previois routines hadn't detected it.
@@ -890,7 +892,7 @@ class Probe
 		}
 		if (!empty($json['public_forum'])) {
 			$data['community'] = $json['public_forum'];
-			$data['account-type'] = Contact::PAGE_COMMUNITY;
+			$data['account-type'] = User::PAGE_FLAGS_COMMUNITY;
 		}
 
 		if (!empty($json['profile'])) {
@@ -946,7 +948,7 @@ class Probe
 		$webfinger = json_decode($data, true);
 		if (!empty($webfinger)) {
 			if (!isset($webfinger["links"])) {
-				Logger::log("No json webfinger links for ".$url, Logger::DEBUG);
+				Logger::info('No json webfinger links', ['url' => $url]);
 				return [];
 			}
 			return $webfinger;
@@ -955,13 +957,13 @@ class Probe
 		// If it is not JSON, maybe it is XML
 		$xrd = XML::parseString($data, true);
 		if (!is_object($xrd)) {
-			Logger::log("No webfinger data retrievable for ".$url, Logger::DEBUG);
+			Logger::info('No webfinger data retrievable', ['url' => $url]);
 			return [];
 		}
 
 		$xrd_arr = XML::elementToArray($xrd);
 		if (!isset($xrd_arr["xrd"]["link"])) {
-			Logger::log("No XML webfinger links for ".$url, Logger::DEBUG);
+			Logger::info('No XML webfinger links', ['url' => $url]);
 			return [];
 		}
 
@@ -1012,13 +1014,13 @@ class Probe
 		}
 		$content = $curlResult->getBody();
 		if (!$content) {
-			Logger::log("Empty body for ".$noscrape_url, Logger::DEBUG);
+			Logger::info('Empty body', ['url' => $noscrape_url]);
 			return [];
 		}
 
 		$json = json_decode($content, true);
 		if (!is_array($json)) {
-			Logger::log("No json data for ".$noscrape_url, Logger::DEBUG);
+			Logger::info('No json data', ['url' => $noscrape_url]);
 			return [];
 		}
 
@@ -1132,7 +1134,7 @@ class Probe
 	{
 		$data = [];
 
-		Logger::log("Check profile ".$profile_link, Logger::DEBUG);
+		Logger::info('Check profile', ['link' => $profile_link]);
 
 		// Fetch data via noscrape - this is faster
 		$noscrape_url = str_replace(["/hcard/", "/profile/"], "/noscrape/", $profile_link);
@@ -1166,7 +1168,7 @@ class Probe
 		$prof_data["fn"]           = $data['name']    ?? null;
 		$prof_data["key"]          = $data['pubkey']  ?? null;
 
-		Logger::log("Result for profile ".$profile_link.": ".print_r($prof_data, true), Logger::DEBUG);
+		Logger::debug('Result', ['link' => $profile_link, 'data' => $prof_data]);
 
 		return $prof_data;
 	}
@@ -1720,9 +1722,9 @@ class Probe
 	 */
 	private static function twitter($uri)
 	{
-		if (preg_match('=(.*)@twitter.com=i', $uri, $matches)) {
+		if (preg_match('=([^@]+)@(?:mobile\.)?twitter\.com$=i', $uri, $matches)) {
 			$nick = $matches[1];
-		} elseif (preg_match('=https?://twitter.com/(.*)=i', $uri, $matches)) {
+		} elseif (preg_match('=^https?://(?:mobile\.)?twitter\.com/(.+)=i', $uri, $matches)) {
 			$nick = $matches[1];
 		} else {
 			return [];
@@ -1874,12 +1876,6 @@ class Probe
 		$data["url"] = $url;
 		$data["poll"] = $url;
 
-		if (!empty($feed_data["header"]["author-link"])) {
-			$data["baseurl"] = $feed_data["header"]["author-link"];
-		} else {
-			$data["baseurl"] = $data["url"];
-		}
-
 		$data["network"] = Protocol::FEED;
 
 		return $data;
@@ -1923,7 +1919,7 @@ class Probe
 		}
 
 		$msgs = Email::poll($mbox, $uri);
-		Logger::log('searching '.$uri.', '.count($msgs).' messages found.', Logger::DEBUG);
+		Logger::info('Messages found', ['uri' => $uri, 'count' => count($msgs)]);
 
 		if (!count($msgs)) {
 			return [];
@@ -2006,7 +2002,7 @@ class Probe
 
 		$fixed = $scheme.$host.$port.$path.$query.$fragment;
 
-		Logger::log('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, Logger::DATA);
+		Logger::debug('Avatar fixed', ['base' => $base, 'avatar' => $avatar, 'fixed' => $fixed]);
 
 		return $fixed;
 	}