From 6bed6d5587893c34e50658a718ef162daa3fa3c3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 6 Jun 2020 14:54:04 -0400
Subject: [PATCH 1/2] Add probe_detect hook

---
 doc/Addons.md         | 13 +++++++++++++
 src/Network/Probe.php | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/doc/Addons.md b/doc/Addons.md
index bf8f9eef4..bff707fa8 100644
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -466,6 +466,19 @@ Hook data is a `\FastRoute\RouterCollector` object that should be used to add ad
 
 **Notice**: The class whose name is provided in the route handler must be reachable via auto-loader.
 
+### probe_detect
+
+Called before trying to detect the target network of a URL.
+If any registered hook function sets the `result` key of the hook data array, it will be returned immediately.
+Hook functions should also return immediately if the hook data contains an existing result. 
+
+Hook data:
+
+- **uri** (input): the profile URI.
+- **network** (input): the target network (can be empty for auto-detection).
+- **uid** (input): the user to return the contact data for (can be empty for public contacts).
+- **result** (output): Set by the hook function to indicate a successful detection.
+
 ## Complete list of hook callbacks
 
 Here is a complete list of all hook callbacks with file locations (as of 24-Sep-2018). Please see the source for details of any hooks not documented above.
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 7a6711c5f..d4545e725 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -24,6 +24,7 @@ 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;
@@ -617,6 +618,19 @@ class Probe
 	{
 		$parts = parse_url($uri);
 
+		$hookData = [
+			'uri'     => $uri,
+			'network' => $network,
+			'uid'     => $uid,
+			'result'  => [],
+		];
+
+		Hook::callAll('probe_detect', $hookData);
+
+		if ($hookData['result']) {
+			return $hookData['result'];
+		}
+
 		if (!empty($parts["scheme"]) && !empty($parts["host"])) {
 			$host = $parts["host"];
 			if (!empty($parts["port"])) {

From 5cb3a5ff746a02ac6e864c120b734505985da983 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 6 Jun 2020 15:08:21 -0400
Subject: [PATCH 2/2] Remove obsolete Twitter probing

- Profile page source offers no details about accounts when not logged in
---
 src/Network/Probe.php | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index d4545e725..ff364d12a 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -1745,39 +1745,6 @@ class Probe
 		$data['network'] = Protocol::TWITTER;
 		$data['baseurl'] = 'https://twitter.com';
 
-		$curlResult = Network::curl($data['url'], false);
-		if (!$curlResult->isSuccess()) {
-			return [];
-		}
-
-		$body = $curlResult->getBody();
-		$doc = new DOMDocument();
-		@$doc->loadHTML($body);
-		$xpath = new DOMXPath($doc);
-
-		$list = $xpath->query('//img[@class]');
-		foreach ($list as $node) {
-			$img_attr = [];
-			if ($node->attributes->length) {
-				foreach ($node->attributes as $attribute) {
-					$img_attr[$attribute->name] = $attribute->value;
-				}
-			}
-
-			if (empty($img_attr['class'])) {
-				continue;
-			}
-
-			if (strpos($img_attr['class'], 'ProfileAvatar-image') !== false) {
-				if (!empty($img_attr['src'])) {
-					$data['photo'] = $img_attr['src'];
-				}
-				if (!empty($img_attr['alt'])) {
-					$data['name'] = $img_attr['alt'];
-				}
-			}
-		}
-
 		return $data;
 	}