use Friendica\Core\Cache\Duration;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
+use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
}
}
- /**
- * Get the poll interval for the given contact array
- *
- * @param array $contact
- * @return int Poll interval in minutes
- */
- public static function getPollInterval(array $contact)
- {
- 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) {
- return 0;
- }
- /*
- * Based on $contact['priority'], should we poll this site now? Or later?
- */
-
- $min_poll_interval = max(1, DI::config()->get('system', 'min_poll_interval'));
-
- $poll_intervals = [$min_poll_interval, 15, 30, 60, 120, 180, 360, 720 ,1440, 10080, 43200];
-
- //$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'];
-
- return $poll_intervals[$rating];
- }
-
/**
* Read a RSS/RDF/Atom feed and create an item entry for it
*
$items[] = $item;
break;
} elseif (!Item::isValid($item)) {
- Logger::info('Feed is invalid', ['created' => $item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
+ Logger::info('Feed item is invalid', ['created' => $item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
+ continue;
+ } elseif (Item::isTooOld($item)) {
+ Logger::info('Feed is too old', ['created' => $item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
continue;
}
// Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
if ($notify) {
$item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname());
- unset($item['uri']);
+ $item['uri'] = Item::newURI($item['uid'], $item['guid']);
unset($item['thr-parent']);
unset($item['parent-uri']);
$notify = PRIORITY_MEDIUM;
}
- $postings[] = ['item' => $item, 'notify' => $notify,
- 'taglist' => $taglist, 'attachments' => $attachments];
+ if (!Post\Delayed::exists($item["uri"])) {
+ $postings[] = ['item' => $item, 'notify' => $notify,
+ 'taglist' => $taglist, 'attachments' => $attachments];
+ } else {
+ Logger::info('Post already exists in the delayed posts queue', ['uri' => $item["uri"]]);
+ }
}
if (!empty($postings)) {
+ $min_posting = DI::config()->get('system', 'minimum_posting_interval', 0);
$total = count($postings);
if ($total > 1) {
- $interval = self::getPollInterval($contact);
- $delay = round(($interval * 60) / $total);
+ // Posts shouldn't be delayed more than a day
+ $interval = min(1440, self::getPollInterval($contact));
+ $delay = max(round(($interval * 60) / $total), 60 * $min_posting);
Logger::notice('Got posting delay', ['delay' => $delay, 'interval' => $interval, 'items' => $total, 'cid' => $contact['id'], 'url' => $contact['url']]);
} else {
$delay = 0;
foreach ($postings as $posting) {
if ($delay > 0) {
- $publish_at = DateTimeFormat::utc('now + ' . $post_delay . ' minute');
- Logger::notice('Got publishing date', ['delay' => $delay, 'publish_at' => $publish_at, 'cid' => $contact['id'], 'url' => $contact['url']]);
+ $publish_time = time() + $post_delay;
+ Logger::notice('Got publishing date', ['delay' => $delay, 'cid' => $contact['id'], 'url' => $contact['url']]);
$post_delay += $delay;
+ } else {
+ $publish_time = time();
}
- $id = Item::insert($posting['item'], $posting['notify']);
-
- Logger::notice("Feed for contact " . $contact["url"] . " stored under id " . $id);
-
- if (!empty($id) && (!empty($posting['taglist']) || !empty($posting['attachments']))) {
- $feeditem = Item::selectFirst(['uri-id'], ['id' => $id]);
- foreach ($posting['taglist'] as $tag) {
- Tag::store($feeditem['uri-id'], Tag::HASHTAG, $tag);
- }
- foreach ($posting['attachments'] as $attachment) {
- $attachment['uri-id'] = $feeditem['uri-id'];
- Post\Media::insert($attachment);
- }
+ $last_publish = DI::pConfig()->get($posting['item']['uid'], 'system', 'last_publish', 0, true);
+ $next_publish = max($last_publish + (60 * $min_posting), time());
+ if ($publish_time < $next_publish) {
+ Logger::notice('Adapting publish time',
+ ['last' => date(DateTimeFormat::MYSQL, $last_publish),
+ 'next' => date(DateTimeFormat::MYSQL, $next_publish),
+ 'publish' => date(DateTimeFormat::MYSQL, $publish_time)]);
+ $publish_time = $next_publish;
}
+ $publish_at = date(DateTimeFormat::MYSQL, $publish_time);
+
+ Post\Delayed::add($publish_at, $posting['item'], $posting['notify'], $posting['taglist'], $posting['attachments']);
+ DI::pConfig()->set($item['uid'], 'system', 'last_publish', $next_publish);
}
}
}
}
+ /**
+ * Get the poll interval for the given contact array
+ *
+ * @param array $contact
+ * @return int Poll interval in minutes
+ */
+ public static function getPollInterval(array $contact)
+ {
+ 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) {
+ return 0;
+ }
+ /*
+ * Based on $contact['priority'], should we poll this site now? Or later?
+ */
+
+ $min_poll_interval = max(1, DI::config()->get('system', 'min_poll_interval'));
+
+ $poll_intervals = [$min_poll_interval, 15, 30, 60, 120, 180, 360, 720 ,1440, 10080, 43200];
+
+ //$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'];
+
+ return $poll_intervals[$rating];
+ }
+
/**
* Convert a tag array to a tag string
*
projects / friendica.git / blobdiff