X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FOnePoll.php;h=2d36ee8f47c49efdb91b42e6545b1dc470f0b868;hb=cbe2d1745ba327464f260efd7d782c383994a285;hp=0579bfa24505f8979dd6fd5534cf32f5950bbdb2;hpb=acaee626f5f23f4c1dc19c31896a0797a251b58f;p=friendica.git

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 0579bfa245..2d36ee8f47 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -11,6 +11,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Protocol\ActivityPub;
@@ -27,13 +28,9 @@ class OnePoll
 	{
 		$a = BaseObject::getApp();
 
-		Logger::log('start');
+		Logger::log('Start for contact ' . $contact_id);
 
-		$manual_id  = 0;
-		$generation = 0;
-		$hub_update = false;
 		$force      = false;
-		$restart    = false;
 
 		if ($command == "force") {
 			$force = true;
@@ -44,7 +41,6 @@ class OnePoll
 			return;
 		}
 
-		$d = DateTimeFormat::utcNow();
 
 		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
 		if (!DBA::isResult($contact)) {
@@ -60,26 +56,25 @@ class OnePoll
 			$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
 		}
 
-		// We currently don't do anything with AP here
-		if ($contact['network'] === Protocol::ACTIVITYPUB) {
-			return;
-		}
+		// These three networks can be able to speak AP, so we are trying to fetch AP profile data here
+		if (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN])) {
+			$apcontact = APContact::getByURL($contact['url'], true);
 
-		// load current friends if possible.
-		if (($contact['poco'] != "") && ($contact['success_update'] > $contact['failure_update'])) {
-			$r = q("SELECT count(*) AS total FROM glink
-				WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
-				intval($contact['id'])
-			);
-			if (DBA::isResult($r)) {
-				if (!$r[0]['total']) {
-					PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
-				}
+			$updated = DateTimeFormat::utcNow();
+			if (($contact['network'] === Protocol::ACTIVITYPUB) && empty($apcontact)) {
+				self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
+				Contact::markForArchival($contact);
+				Logger::log('Contact archived');
+				return;
+			} elseif (!empty($apcontact)) {
+				$fields = ['last-update' => $updated, 'success_update' => $updated];
+				self::updateContact($contact, $fields);
+				Contact::unmarkForArchival($contact);
 			}
 		}
 
 		// Diaspora users, archived users and followers are only checked if they still exist.
-		if ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) {
+		if (($contact['network'] != Protocol::ACTIVITYPUB) && ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER))) {
 			$last_updated = PortableContact::lastUpdated($contact["url"], true);
 			$updated = DateTimeFormat::utcNow();
 
@@ -97,56 +92,64 @@ class OnePoll
 			} else {
 				self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
 				Contact::markForArchival($contact);
-				Logger::log('Contact '.$contact['id'].' is marked for archival', Logger::DEBUG);
-			}
-
-			return;
-		}
-
-		$xml = false;
-
-		$t = $contact['last-update'];
-
-		if ($contact['subhub']) {
-			$poll_interval = Config::get('system', 'pushpoll_frequency', 3);
-			$contact['priority'] = intval($poll_interval);
-			$hub_update = false;
-
-			if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) {
-				$hub_update = true;
+				Logger::log('Contact archived');
+				return;
 			}
-		} else {
-			$hub_update = false;
 		}
 
-		$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
-			? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
-			: DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
-		);
-
 		// Update the contact entry
-		if (($contact['network'] === Protocol::OSTATUS) || ($contact['network'] === Protocol::DIASPORA) || ($contact['network'] === Protocol::DFRN)) {
-			if (!PortableContact::reachable($contact['url'])) {
+		if (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
+			$updated = DateTimeFormat::utcNow();
+			// Currently we can't check every AP implementation, so we don't do it at all
+			if (($contact['network'] != Protocol::ACTIVITYPUB) && !PortableContact::reachable($contact['url'])) {
 				Logger::log("Skipping probably dead contact ".$contact['url']);
 
 				// set the last-update so we don't keep polling
-				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				self::updateContact($contact, ['last-update' => $updated]);
 				return;
 			}
 
 			if (!Contact::updateFromProbe($contact["id"])) {
-				Contact::markForArchival($contact);
-				Logger::log('Contact is marked dead');
-
 				// set the last-update so we don't keep polling
-				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				self::updateContact($contact, ['last-update' => $updated]);
+				Contact::markForArchival($contact);
+				Logger::log('Contact archived');
 				return;
 			} else {
+				$fields = ['last-update' => $updated, 'success_update' => $updated];
+				self::updateContact($contact, $fields);
 				Contact::unmarkForArchival($contact);
 			}
 		}
 
+		// load current friends if possible.
+		if (!empty($contact['poco']) && ($contact['success_update'] > $contact['failure_update'])) {
+			$r = q("SELECT count(*) AS total FROM glink
+				WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
+				intval($contact['id'])
+			);
+			if (DBA::isResult($r)) {
+				if (!$r[0]['total']) {
+					PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
+				}
+			}
+		}
+
+		// We don't poll our followers
+		if ($contact["rel"] == Contact::FOLLOWER) {
+			Logger::log("Don't poll follower");
+			return;
+		}
+
+		// Don't poll if polling is deactivated (But we poll feeds and mails anyway)
 		if (!in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) && Config::get('system', 'disable_polling')) {
+			Logger::log('Polling is disabled');
+			return;
+		}
+
+		// We don't poll AP contacts by now
+		if ($contact['network'] === Protocol::ACTIVITYPUB) {
+			Logger::log("Don't poll AP contact");
 			return;
 		}
 
@@ -172,6 +175,24 @@ class OnePoll
 
 		$importer = $r[0];
 		$url = '';
+		$xml = false;
+
+		if ($contact['subhub']) {
+			$poll_interval = Config::get('system', 'pushpoll_frequency', 3);
+			$contact['priority'] = intval($poll_interval);
+			$hub_update = false;
+
+			if (DateTimeFormat::utcNow() > DateTimeFormat::utc($contact['last-update'] . " + 1 day")) {
+				$hub_update = true;
+			}
+		} else {
+			$hub_update = false;
+		}
+
+		$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
+			? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
+			: DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
+		);
 
 		Logger::log("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
@@ -203,8 +224,9 @@ class OnePoll
 
 			if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
 				// set the last-update so we don't keep polling
-				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
 				Contact::markForArchival($contact);
+				Logger::log('Contact archived');
 				return;
 			}
 
@@ -214,27 +236,24 @@ class OnePoll
 			Logger::log('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, Logger::DATA);
 
 			if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) {
-				Logger::log("$url appears to be dead - marking for death ");
-
 				// dead connection - might be a transient event, or this might
 				// mean the software was uninstalled or the domain expired.
 				// Will keep trying for one month.
-
-				Contact::markForArchival($contact);
+				Logger::log("$url appears to be dead - marking for death ");
 
 				// set the last-update so we don't keep polling
 				$fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
 				self::updateContact($contact, $fields);
+				Contact::markForArchival($contact);
 				return;
 			}
 
 			if (!strstr($handshake_xml, '<')) {
 				Logger::log('response from ' . $url . ' did not contain XML.');
 
-				Contact::markForArchival($contact);
-
 				$fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
 				self::updateContact($contact, $fields);
+				Contact::markForArchival($contact);
 				return;
 			}
 
@@ -242,22 +261,21 @@ class OnePoll
 			$res = XML::parseString($handshake_xml);
 
 			if (intval($res->status) == 1) {
+				// we may not be friends anymore. Will keep trying for one month.
 				Logger::log("$url replied status 1 - marking for death ");
 
-				// we may not be friends anymore. Will keep trying for one month.
 				// set the last-update so we don't keep polling
 				$fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
 				self::updateContact($contact, $fields);
-
 				Contact::markForArchival($contact);
 			} elseif ($contact['term-date'] > DBA::NULL_DATETIME) {
-				Logger::log("$url back from the dead - removing mark for death");
 				Contact::unmarkForArchival($contact);
 			}
 
 			if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
 				// set the last-update so we don't keep polling
 				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				Logger::log('Contact status is ' . $res->status);
 				return;
 			}
 
@@ -287,6 +305,13 @@ class OnePoll
 				$final_dfrn_id = substr($final_dfrn_id, 2);
 			}
 
+			// There are issues with the legacy DFRN transport layer.
+			// Since we mostly don't use it anyway, we won't dig into it deeper, but simply ignore it.
+			if (empty($final_dfrn_id) || empty($orig_id)) {
+				Logger::log('Contact has got no ID - quitting');
+				return;
+			}
+
 			if ($final_dfrn_id != $orig_id) {
 				// did not decode properly - cannot trust this site
 				Logger::log('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
@@ -324,10 +349,10 @@ class OnePoll
 			}
 
 			// Are we allowed to import from this person?
-
 			if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) {
 				// set the last-update so we don't keep polling
 				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				Logger::log('Contact is blocked or only a follower');
 				return;
 			}
 
@@ -337,8 +362,9 @@ class OnePoll
 
 			if ($curlResult->isTimeout()) {
 				// set the last-update so we don't keep polling
-				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
 				Contact::markForArchival($contact);
+				Logger::log('Contact archived');
 				return;
 			}
 
@@ -350,8 +376,9 @@ class OnePoll
 			$mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
 			if ($mail_disabled) {
 				// set the last-update so we don't keep polling
-				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
 				Contact::markForArchival($contact);
+				Logger::log('Contact archived');
 				return;
 			}
 
@@ -486,7 +513,7 @@ class OnePoll
 
 							// If it seems to be a reply but a header couldn't be found take the last message with matching subject
 							if (empty($datarray['parent-uri']) && $reply) {
-								$condition = ['title' => $datarray['title'], 'uid' => importer_uid, 'network' => Protocol::MAIL];
+								$condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
 								$params = ['order' => ['created' => true]];
 								$parent = Item::selectFirst(['parent-uri'], $condition, $params);
 								if (DBA::isResult($parent)) {
@@ -548,7 +575,7 @@ class OnePoll
 								$datarray['allow_cid'] = '<' . $contact['id'] . '>';
 							}
 
-							$stored_item = Item::insert($datarray);
+							Item::insert($datarray);
 
 							switch ($mailconf['action']) {
 								case 0:
@@ -646,10 +673,10 @@ class OnePoll
 			DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
 			Contact::markForArchival($contact);
 		} else {
-			$updated = DateTimeFormat::utcNow();
-			DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
+			self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
 		}
 
+		Logger::log('End');
 		return;
 	}
 
@@ -666,7 +693,8 @@ class OnePoll
 	 * @brief Updates a personal contact entry and the public contact entry
 	 *
 	 * @param array $contact The personal contact entry
-	 * @param array $fields The fields that are updated
+	 * @param array $fields  The fields that are updated
+	 * @throws \Exception
 	 */
 	private static function updateContact(array $contact, array $fields)
 	{