X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGContact.php;h=ec53133c941ba040461a4f35ed2154d1efd14efe;hb=6749b2c887552feef3a671c4063425b11a92014a;hp=109f5d54b3b41a519f9954b595ad3c92261fe1da;hpb=7029012f27e9f5199617ae1ec2c3aae10f0d1fc8;p=friendica.git

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 109f5d54b3..ec53133c94 100644
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -35,6 +35,7 @@ use Friendica\Network\Probe;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
@@ -42,19 +43,6 @@ use Friendica\Util\Strings;
  */
 class GContact
 {
-	/**
-	 * No discovery of followers/followings
-	 */
-	const DISCOVERY_NONE = 0;
-	/**
-	 * Only discover followers/followings from direct contacts
-	 */
-	const DISCOVERY_DIRECT = 1;
-	/**
-	 * Recursive discovery of followers/followings
-	 */
-	const DISCOVERY_RECURSIVE = 2;
-
 	/**
 	 * Search global contact table by nick or name
 	 *
@@ -536,7 +524,7 @@ class GContact
 		$done[] = DI::baseUrl() . '/poco';
 
 		if (strlen(DI::config()->get('system', 'directory'))) {
-			$x = DI::httpRequest()->fetchUrl(Search::getGlobalDirectory() . '/pubsites');
+			$x = DI::httpRequest()->fetch(Search::getGlobalDirectory() . '/pubsites');
 			if (!empty($x)) {
 				$j = json_decode($x);
 				if (!empty($j->entries)) {
@@ -1287,129 +1275,6 @@ class GContact
 		}
 	}
 
-	/**
-	 * Fetches the followers of a given profile and adds them
-	 *
-	 * @param string $url URL of a profile
-	 * @return void
-	 */
-	public static function discoverFollowers(string $url)
-	{
-		$gcontact = DBA::selectFirst('gcontact', ['id', 'last_discovery'], ['nurl' => Strings::normaliseLink(($url))]);
-		if (!DBA::isResult($gcontact)) {
-			return;
-		}
-
-		if ($gcontact['last_discovery'] > DateTimeFormat::utc('now - 1 month')) {
-			Logger::info('Last discovery was less then a month before.', ['url' => $url, 'discovery' => $gcontact['last_discovery']]);
-			return;
-		}
-
-		$gcid = $gcontact['id'];
-
-		$apcontact = APContact::getByURL($url);
-
-		if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) {
-			$followers = ActivityPub::fetchItems($apcontact['followers']);
-		} else {
-			$followers = [];
-		}
-
-		if (!empty($apcontact['following']) && is_string($apcontact['following'])) {
-			$followings = ActivityPub::fetchItems($apcontact['following']);
-		} else {
-			$followings = [];
-		}
-
-		if (!empty($followers) || !empty($followings)) {
-			if (!empty($followers)) {
-				// Clear the follower list, since it will be recreated in the next step
-				DBA::update('gfollower', ['deleted' => true], ['gcid' => $gcid]);
-			}
-
-			$contacts = [];
-			foreach (array_merge($followers, $followings) as $contact) {
-				if (is_string($contact)) {
-					$contacts[] = $contact;
-				} elseif (!empty($contact['url']) && is_string($contact['url'])) {
-					$contacts[] = $contact['url'];
-				}
-			}
-			$contacts = array_unique($contacts);
-
-			Logger::info('Discover AP contacts', ['url' => $url, 'contacts' => count($contacts)]);
-			foreach ($contacts as $contact) {
-				$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(($contact))]);
-				if (DBA::isResult($gcontact)) {
-					$fields = [];
-					if (in_array($contact, $followers)) {
-						$fields = ['gcid' => $gcid, 'follower-gcid' => $gcontact['id']];
-					} elseif (in_array($contact, $followings)) {
-						$fields = ['gcid' => $gcontact['id'], 'follower-gcid' => $gcid];
-					}
-
-					if (!empty($fields)) {
-						Logger::info('Set relation between contacts', $fields);
-						DBA::update('gfollower', ['deleted' => false], $fields, true);
-						continue;
-					}
-				}
-
-				if (!Network::isUrlBlocked($contact)) {
-					Logger::info('Discover new AP contact', ['url' => $contact]);
-					Worker::add(PRIORITY_LOW, 'UpdateGContact', $contact, 'nodiscover');
-				} else {
-					Logger::info('No discovery, the URL is blocked.', ['url' => $contact]);
-				}
-			}
-			if (!empty($followers)) {
-				// Delete all followers that aren't undeleted
-				DBA::delete('gfollower', ['gcid' => $gcid, 'deleted' => true]);
-			}
-
-			DBA::update('gcontact', ['last_discovery' => DateTimeFormat::utcNow()], ['id' => $gcid]);
-			Logger::info('AP contacts discovery finished, last discovery set', ['url' => $url]);
-			return;
-		}
-
-		$data = Probe::uri($url);
-		if (empty($data['poco'])) {
-			return;
-		}
-
-		$curlResult = Network::curl($data['poco']);
-		if (!$curlResult->isSuccess()) {
-			return;
-		}
-		$poco = json_decode($curlResult->getBody(), true);
-		if (empty($poco['entry'])) {
-			return;
-		}
-
-		Logger::info('PoCo Discovery started', ['url' => $url, 'contacts' => count($poco['entry'])]);
-
-		foreach ($poco['entry'] as $entries) {
-			if (!empty($entries['urls'])) {
-				foreach ($entries['urls'] as $entry) {
-					if ($entry['type'] == 'profile') {
-						if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink(($entry['value']))])) {
-							continue;
-						}
-						if (!Network::isUrlBlocked($entry['value'])) {
-							Logger::info('Discover new PoCo contact', ['url' => $entry['value']]);
-							Worker::add(PRIORITY_LOW, 'UpdateGContact', $entry['value'], 'nodiscover');
-						} else {
-							Logger::info('No discovery, the URL is blocked.', ['url' => $entry['value']]);
-						}
-					}
-				}
-			}
-		}
-
-		DBA::update('gcontact', ['last_discovery' => DateTimeFormat::utcNow()], ['id' => $gcid]);
-		Logger::info('PoCo Discovery finished', ['url' => $url]);
-	}
-
 	/**
 	 * Returns a random, global contact of the current node
 	 *