X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPost%2FDelayed.php;h=0f47264c538f65caf8cbe3b270ebd13ddf92407e;hb=2108be7e07792a069ef0650126ac22d470a4b7fc;hp=8182dfdd8e7caa29962786e243ed3b4338a7ec0c;hpb=2a431b580f2e8f6a596e84175932e793678cde63;p=friendica.git diff --git a/src/Model/Post/Delayed.php b/src/Model/Post/Delayed.php index 8182dfdd8e..0f47264c53 100644 --- a/src/Model/Post/Delayed.php +++ b/src/Model/Post/Delayed.php @@ -33,23 +33,40 @@ use Friendica\Util\DateTimeFormat; class Delayed { + /** + * The content of the post is posted as is. Connector settings are using the default settings. + * This is used for automated scheduled posts via feeds or from the API. + */ + const PREPARED = 0; + /** + * The content is posted like a manual post. Means some processing of body will be done. + * Also it is posted with default permissions and default connector settings. + * This is used for mirrored connector posts. + */ + const UNPREPARED = 1; + /** + * Like PREPARED, but additionally the connector settings can differ. + * This is used when manually publishing scheduled posts. + */ + const PREPARED_NO_HOOK = 2; + /** * Insert a new delayed post * - * @param string $uri - * @param array $item - * @param integer $notify - * @param bool $unprepared - * @param string $delayed - * @param array $taglist - * @param array $attachments - * @return bool insert success - */ - public static function add(string $uri, array $item, int $notify = 0, bool $unprepared = false, string $delayed = '', array $taglist = [], array $attachments = []) + * @param string $uri + * @param array $item + * @param int $notify + * @param int $preparation_mode + * @param string $delayed + * @param array $taglist + * @param array $attachments + * @return int ID of the created delayed post entry + */ + public static function add(string $uri, array $item, int $notify = 0, int $preparation_mode = self::PREPARED, string $delayed = '', array $taglist = [], array $attachments = []) { if (empty($item['uid']) || self::exists($uri, $item['uid'])) { Logger::notice('No uid or already found'); - return false; + return 0; } if (empty($delayed)) { @@ -58,19 +75,28 @@ class Delayed $last_publish = DI::pConfig()->get($item['uid'], 'system', 'last_publish', 0, true); $next_publish = max($last_publish + (60 * $min_posting), time()); $delayed = date(DateTimeFormat::MYSQL, $next_publish); - } else { - $next_publish = strtotime($delayed); + DI::pConfig()->set($item['uid'], 'system', 'last_publish', $next_publish); } Logger::notice('Adding post for delayed publishing', ['uid' => $item['uid'], 'delayed' => $delayed, 'uri' => $uri]); - if (!Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $delayed], 'DelayedPublish', $item, $notify, $taglist, $attachments, $unprepared, $uri)) { - return false; + $wid = Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $delayed], 'DelayedPublish', $item, $notify, $taglist, $attachments, $preparation_mode, $uri); + if (!$wid) { + return 0; } - DI::pConfig()->set($item['uid'], 'system', 'last_publish', $next_publish); + $delayed_post = [ + 'uri' => $uri, + 'uid' => $item['uid'], + 'delayed' => $delayed, + 'wid' => $wid, + ]; - return DBA::insert('delayed-post', ['uri' => $uri, 'uid' => $item['uid'], 'delayed' => $delayed], Database::INSERT_IGNORE); + if (DBA::insert('delayed-post', $delayed_post, Database::INSERT_IGNORE)) { + return DBA::lastInsertId(); + } else { + return 0; + } } /** @@ -86,6 +112,23 @@ class Delayed return DBA::delete('delayed-post', ['uri' => $uri, 'uid' => $uid]); } + /** + * Delete scheduled posts and the associated workerqueue entry + * + * @param integer $id + * @return void + */ + public static function deleteById(int $id) + { + $post = DBA::selectFirst('delayed-post', ['wid'], ['id' => $id]); + if (empty($post['wid'])) { + return; + } + + DBA::delete('delayed-post', ['id' => $id]); + DBA::delete('workerqueue', ['id' => $post['wid']]); + } + /** * Check if an entry exists * @@ -99,20 +142,64 @@ class Delayed return DBA::exists('delayed-post', ['uri' => $uri, 'uid' => $uid]); } + /** + * Fetch parameters for delayed posts + * + * @param integer $id + * @return array + */ + public static function getParametersForid(int $id) + { + $delayed = DBA::selectFirst('delayed-post', ['id', 'uid', 'wid', 'delayed'], ['id' => $id]); + if (empty($delayed['wid'])) { + return []; + } + + $worker = DBA::selectFirst('workerqueue', ['parameter'], ['id' => $delayed['wid'], 'command' => 'DelayedPublish']); + if (empty($worker)) { + return []; + } + + $parameters = json_decode($worker['parameter'], true); + if (empty($parameters)) { + return []; + } + + // Make sure to only publish the attachments in the dedicated array field + if (empty($parameters[3]) && !empty($parameters[0]['attachments'])) { + $parameters[3] = $parameters[0]['attachments']; + unset($parameters[0]['attachments']); + } + + return [ + 'parameters' => $delayed, + 'item' => $parameters[0], + 'notify' => $parameters[1], + 'taglist' => $parameters[2], + 'attachments' => $parameters[3], + 'unprepared' => $parameters[4], + 'uri' => $parameters[5], + ]; + } + /** * Publish a delayed post * - * @param array $item - * @param integer $notify - * @param array $taglist - * @param array $attachments - * @param bool $unprepared + * @param array $item + * @param int $notify + * @param array $taglist + * @param array $attachments + * @param int $preparation_mode * @param string $uri * @return bool */ - public static function publish(array $item, int $notify = 0, array $taglist = [], array $attachments = [], bool $unprepared = false, string $uri = '') + public static function publish(array $item, int $notify = 0, array $taglist = [], array $attachments = [], int $preparation_mode = self::PREPARED, string $uri = '') { - if ($unprepared) { + if (!empty($attachments)) { + $item['attachments'] = $attachments; + } + + if ($preparation_mode == self::UNPREPARED) { $_SESSION['authenticated'] = true; $_SESSION['uid'] = $item['uid']; @@ -136,10 +223,11 @@ class Delayed if (self::exists($uri, $item['uid'])) { self::delete($uri, $item['uid']); } - + return $id; } - $id = Item::insert($item, $notify); + + $id = Item::insert($item, $notify, $preparation_mode == self::PREPARED); Logger::notice('Post stored', ['id' => $id, 'uid' => $item['uid'], 'cid' => $item['contact-id']]); @@ -157,11 +245,6 @@ class Delayed foreach ($taglist as $tag) { Tag::store($feeditem['uri-id'], Tag::HASHTAG, $tag); } - - foreach ($attachments as $attachment) { - $attachment['uri-id'] = $feeditem['uri-id']; - Media::insert($attachment); - } } return $id;