From a47830990a72758cf9db058a879ecabc74d12eb4 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 23 Nov 2021 17:46:20 -0500
Subject: [PATCH 1/2] Improve probe_detect hook

- Remove Twitter probe from core
- Allow hook function to better abort the probe_detect process
---
 doc/Addons.md         |  2 +-
 src/Network/Probe.php | 49 ++++---------------------------------------
 2 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/doc/Addons.md b/doc/Addons.md
index 230e9e93b9..51901fb958 100644
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -477,7 +477,7 @@ 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.
+- **result** (output): Leave null if address isn't relevant to the connector, set to contact array if probe is successful, false otherwise.
 
 ### support_follow
 
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 10d03fa038..ee36651d6d 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -682,26 +682,18 @@ class Probe
 			'uri'     => $uri,
 			'network' => $network,
 			'uid'     => $uid,
-			'result'  => [],
+			'result'  => null,
 		];
 
 		Hook::callAll('probe_detect', $hookData);
 
-		if ($hookData['result']) {
-			if (!is_array($hookData['result'])) {
-				return [];
-			} else {
-				return $hookData['result'];
-			}
+		if (isset($hookData['result'])) {
+			return is_array($hookData['result']) ? $hookData['result'] : [];
 		}
 
 		$parts = parse_url($uri);
 
-		if (!empty($parts['scheme']) && !empty($parts['host'])) {
-			if (in_array($parts['host'], ['twitter.com', 'mobile.twitter.com'])) {
-				return self::twitter($uri);
-			}
-		} elseif (strstr($uri, '@')) {
+		if (empty($parts['scheme']) || !empty($parts['host']) && strstr($uri, '@')) {
 			// If the URI starts with "mailto:" then jump directly to the mail detection
 			if (strpos($uri, 'mailto:') !== false) {
 				$uri = str_replace('mailto:', '', $uri);
@@ -711,12 +703,6 @@ class Probe
 			if ($network == Protocol::MAIL) {
 				return self::mail($uri, $uid);
 			}
-
-			if (Strings::endsWith($uri, '@twitter.com')
-				|| Strings::endsWith($uri, '@mobile.twitter.com')
-			) {
-				return self::twitter($uri);
-			}
 		} else {
 			Logger::info('URI was not detectable', ['uri' => $uri]);
 			return [];
@@ -1742,33 +1728,6 @@ class Probe
 		return $data;
 	}
 
-	/**
-	 * Check for twitter contact
-	 *
-	 * @param string $uri
-	 *
-	 * @return array twitter data
-	 */
-	private static function twitter($uri)
-	{
-		if (preg_match('=([^@]+)@(?:mobile\.)?twitter\.com$=i', $uri, $matches)) {
-			$nick = $matches[1];
-		} elseif (preg_match('=^https?://(?:mobile\.)?twitter\.com/(.+)=i', $uri, $matches)) {
-			$nick = $matches[1];
-		} else {
-			return [];
-		}
-
-		$data = [];
-		$data['url'] = 'https://twitter.com/' . $nick;
-		$data['addr'] = $nick . '@twitter.com';
-		$data['nick'] = $data['name'] = $nick;
-		$data['network'] = Protocol::TWITTER;
-		$data['baseurl'] = 'https://twitter.com';
-
-		return $data;
-	}
-
 	/**
 	 * Checks HTML page for RSS feed link
 	 *

From 39c763ce2fca4106e9bc4c563a41e6b0ef25f294 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 23 Nov 2021 17:47:02 -0500
Subject: [PATCH 2/2] Add item_by_link hook to allow connectors to import
 remote posts

---
 doc/Addons.md      | 11 +++++++++++
 src/Model/Item.php | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/doc/Addons.md b/doc/Addons.md
index 51901fb958..708a2e0f04 100644
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -479,6 +479,17 @@ Hook data:
 - **uid** (input): the user to return the contact data for (can be empty for public contacts).
 - **result** (output): Leave null if address isn't relevant to the connector, set to contact array if probe is successful, false otherwise.
 
+### item_by_link
+
+Called when trying to probe an item from a given URI.
+If any registered hook function sets the `item_id` key of the hook data array, it will be returned immediately.
+Hook functions should also return immediately if the hook data contains an existing `item_id`.
+
+Hook data:
+- **uri** (input): the item URI.
+- **uid** (input): the user to return the item data for (can be empty for public contacts).
+- **item_id** (output): Leave null if URI isn't relevant to the connector, set to created item array if probe is successful, false otherwise.
+
 ### support_follow
 
 Called to assert whether a connector addon provides follow capabilities.
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 923d72c11b..93e2a80a2f 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3262,6 +3262,18 @@ class Item
 			return $item_id;
 		}
 
+		$hookData = [
+			'uri'     => $uri,
+			'uid'     => $uid,
+			'item_id' => null,
+		];
+
+		Hook::callAll('item_by_link', $hookData);
+
+		if (isset($hookData['item_id'])) {
+			return is_numeric($hookData['item_id']) ? $hookData['item_id'] : 0;
+		}
+
 		if ($fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri)) {
 			$item_id = self::searchByLink($fetched_uri, $uid);
 		} else {