X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FPollContacts.php;h=b3ac529de4aa8569dc9f6c9be9a82bc3b43e8c79;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=190fa01e30f6d07bca6192e7db6eaa64ef5b2fa1;hpb=794f98f479edb00c47bbdf51022718fe9dd61fbf;p=friendica.git

diff --git a/src/Worker/PollContacts.php b/src/Worker/PollContacts.php
index 190fa01e30..b3ac529de4 100644
--- a/src/Worker/PollContacts.php
+++ b/src/Worker/PollContacts.php
@@ -26,7 +26,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact;
+use Friendica\Protocol\Feed;
 use Friendica\Util\DateTimeFormat;
 
 /**
@@ -41,8 +41,7 @@ class PollContacts
 			$abandon_days = 0;
 		}
 
-		$condition = ['network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::FEED, 
-			Protocol::MAIL, Protocol::ZOT, Protocol::PHANTOM], 'self' => false, 'blocked' => false];
+		$condition = ['network' => [Protocol::FEED, Protocol::MAIL, Protocol::OSTATUS], 'self' => false, 'blocked' => false];
 
 		if (!empty($abandon_days)) {
 			$condition = DBA::mergeConditions($condition,
@@ -58,47 +57,16 @@ class PollContacts
 		}
 
 		while ($contact = DBA::fetch($contacts)) {
-			if (in_array($contact['network'], [Protocol::MAIL, Protocol::FEED])) {
-				$ratings = [0, 3, 7, 8, 9, 10];
-				if (DI::config()->get('system', 'adjust_poll_frequency') && ($contact['network'] == Protocol::FEED)) {
-					$rating = $contact['rating'];
-				} elseif (array_key_exists($contact['priority'], $ratings)) {
-					$rating = $ratings[$contact['priority']];
-				} else {
-					$rating = -1;
-				}
-			} else {
-				// Check once a week per default for all other networks
-				$rating = 9;
-			}
-
-			// Friendica and OStatus are checked once a day
-			if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
-				$rating = 8;
-			}
-
-			// Check archived contacts or contacts with unsupported protocols once a month
-			if ($contact['archive'] || in_array($contact['network'], [Protocol::ZOT, Protocol::PHANTOM])) {
-				$rating = 10;
-			}
-
-			if ($rating < 0) {
+			$interval = Feed::getPollInterval($contact);
+			if ($interval == 0) {
 				continue;
 			}
-			/*
-			 * Based on $contact['priority'], should we poll this site now? Or later?
-			 */
-
-			$min_poll_interval = DI::config()->get('system', 'min_poll_interval');
-
-			$poll_intervals = [$min_poll_interval . ' minute', '15 minute', '30 minute',
-				'1 hour', '2 hour', '3 hour', '6 hour', '12 hour' ,'1 day', '1 week', '1 month'];
 
 			$now = DateTimeFormat::utcNow();
-			$next_update = DateTimeFormat::utc($contact['last-update'] . ' + ' . $poll_intervals[$rating]);
+			$next_update = DateTimeFormat::utc($contact['last-update'] . ' + ' . $interval . ' minute');
 
-			if (empty($poll_intervals[$rating]) || ($now < $next_update))  {
-				Logger::debug('No update', ['cid' => $contact['id'], 'rating' => $rating, 'next' => $next_update, 'now' => $now]);
+			if ($now < $next_update)  {
+				Logger::debug('No update', ['cid' => $contact['id'], 'interval' => $interval, 'next' => $next_update, 'now' => $now]);
 				continue;
 			}