Reducing parameter list

[friendica.git] / src / Protocol / Feed.php

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 0c945a1809db6ea7274a2c31960a0b7b779d2a45..821de8c33580556f3d8675531a65ee5f6782a5b5 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -503,7 +503,10 @@ class Feed
                                $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;
                        }
 
@@ -603,7 +606,7 @@ class Feed
                        // 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']);
 
@@ -611,16 +614,21 @@ class Feed
                                $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) {
                                // Posts shouldn't be delayed more than a day
-                               $interval = max(1440, self::getPollInterval($contact));
-                               $delay = round(($interval * 60) / $total);
+                               $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;
@@ -630,13 +638,26 @@ class Feed
 
                        foreach ($postings as $posting) {
                                if ($delay > 0) {
-                                       $publish_at = DateTimeFormat::utc('now + ' . $post_delay . ' second');
-                                       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();
+                               }
+
+                               $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);
 
-                               Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $post_delay],
-                                       'DelayedPublish', $posting['item'], $posting['notify'], $posting['taglist'], $posting['attachments']);
+                               Post\Delayed::add($publish_at, $posting['item'], $posting['notify'], $posting['taglist'], $posting['attachments']);
+                               DI::pConfig()->set($item['uid'], 'system', 'last_publish', $next_publish);
                        }
                }