X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=5ab3d3526419c073a2d2020468f5bd8c4d635f37;hb=d1be68b75462df77100c9262134b70717635ddfe;hp=dce6798b3c305c2288599a7f42ef5b275cf14da8;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index dce6798b3c..5ab3d35264 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -3,14 +3,12 @@
  * @file mod/follow.php
  */
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\Item;
 use Friendica\Network\Probe;
 use Friendica\Database\DBA;
 use Friendica\Util\Strings;
@@ -36,6 +34,9 @@ function follow_post(App $a)
 	$result = Contact::createFromProbe($uid, $url, true);
 
 	if ($result['success'] == false) {
+		// Possibly it is a remote item and not an account
+		follow_remote_item($url);
+
 		if ($result['message']) {
 			notice($result['message']);
 		}
@@ -96,14 +97,14 @@ function follow_content(App $a)
 
 	$protocol = Contact::getProtocol($ret['url'], $ret['network']);
 
-	if (($protocol == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
+	if (($protocol == Protocol::DIASPORA) && !DI::config()->get('system', 'diaspora_enabled')) {
 		notice(DI::l10n()->t("Diaspora support isn't enabled. Contact can't be added."));
 		$submit = '';
 		//$a->internalRedirect($_SESSION['return_path']);
 		// NOTREACHED
 	}
 
-	if (($protocol == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
+	if (($protocol == Protocol::OSTATUS) && DI::config()->get('system', 'ostatus_disabled')) {
 		notice(DI::l10n()->t("OStatus support is disabled. Contact can't be added."));
 		$submit = '';
 		//$a->internalRedirect($_SESSION['return_path']);
@@ -111,6 +112,9 @@ function follow_content(App $a)
 	}
 
 	if ($protocol == Protocol::PHANTOM) {
+		// Possibly it is a remote item and not an account
+		follow_remote_item($url);
+
 		notice(DI::l10n()->t("The network type couldn't be detected. Contact can't be added."));
 		$submit = '';
 		//$a->internalRedirect($_SESSION['return_path']);
@@ -202,3 +206,19 @@ function follow_content(App $a)
 
 	return $o;
 }
+
+function follow_remote_item($url)
+{
+	$item_id = Item::fetchByLink($url, local_user());
+	if (!$item_id) {
+		// If the user-specific search failed, we search and probe a public post
+		$item_id = Item::fetchByLink($url);
+	}
+
+	if (!empty($item_id)) {
+		$item = Item::selectFirst(['guid'], ['id' => $item_id]);
+		if (DBA::isResult($item)) {
+			DI::baseUrl()->redirect('display/' . $item['guid']);
+		}
+	}
+}