Reducing parameter list

diff --git a/src/Model/Post/Delayed.php b/src/Model/Post/Delayed.php
index 357a3e8aa960126483e37ed413d602c5de245e95..963122b5b83eba98a070553b962bbca124339ca9 100644 (file)
--- a/src/Model/Post/Delayed.php
+++ b/src/Model/Post/Delayed.php
@@ -33,8 +33,6 @@ class Delayed
        /**
         * Insert a new delayed post
         *
-        * @param string $uri
-        * @param integer $uid
         * @param string $delayed
         * @param array $item
         * @param integer $notify
@@ -42,16 +40,16 @@ class Delayed
         * @param array $attachments
         * @return bool insert success
         */ 
-       public static function add(string $uri, int $uid, string $delayed, array $item, int $notify = 0, array $taglist = [], array $attachments = [])
+       public static function add(string $delayed, array $item, int $notify = 0, array $taglist = [], array $attachments = [])
        {
-               if (self::exists($uri)) {
+               if (empty($item['uri']) || empty($item['uid']) || self::exists($item['uri'])) {
                        return false;
                }
 
-               Logger::notice('Adding post for delayed publishing', ['uid' => $uid, 'delayed' => $delayed, 'uri' => $uri]);
+               Logger::notice('Adding post for delayed publishing', ['uid' => $item['uid'], 'delayed' => $delayed, 'uri' => $item['uri']]);
 
                Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $delayed], 'DelayedPublish', $item, $notify, $taglist, $attachments);
-               return DBA::insert('delayed-post', ['uri' => $uri, 'uid' => $uid, 'delayed' => $delayed], Database::INSERT_IGNORE);
+               return DBA::insert('delayed-post', ['uri' => $item['uri'], 'uid' => $item['uid'], 'delayed' => $delayed], Database::INSERT_IGNORE);
        }
 
        /**

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 2d5fbff4f722cf9fc6dc9f728603c4acc5ea3e5f..821de8c33580556f3d8675531a65ee5f6782a5b5 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -656,7 +656,7 @@ class Feed
                                }
                                $publish_at = date(DateTimeFormat::MYSQL, $publish_time);
 
-                               Post\Delayed::add($item['uri'], $item['uid'], $publish_at, $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);
                        }
                }