All needed fields are now filled

diff --git a/src/Factory/Api/Mastodon/ScheduledStatus.php b/src/Factory/Api/Mastodon/ScheduledStatus.php
index ce79cc80221626097c394cec68794d3e40ea0f98..f4b805a50a2ce6b015a2d694ad22414b73c25f8e 100644 (file)
--- a/src/Factory/Api/Mastodon/ScheduledStatus.php
+++ b/src/Factory/Api/Mastodon/ScheduledStatus.php
@@ -23,6 +23,8 @@ namespace Friendica\Factory\Api\Mastodon;
 
 use Friendica\BaseFactory;
 use Friendica\Database\Database;
+use Friendica\Model\ItemURI;
+use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Psr\Log\LoggerInterface;
@@ -57,6 +59,17 @@ class ScheduledStatus extends BaseFactory
                        throw new HTTPException\NotFoundException('Scheduled status with ID ' . $id . ' not found for user ' . $uid . '.');
                }
 
-               return new \Friendica\Object\Api\Mastodon\ScheduledStatus($delayed_post, $parameters);
+               $media_ids = [];
+               foreach ($parameters['attachments'] as $attachment) {
+                       $media_ids[] = Photo::getIdForName($attachment['url']);
+               }
+               
+               if (isset($parameters['item']['thr-parent']) && ($parameters['item']['gravity'] ?? GRAVITY_PARENT != GRAVITY_PARENT)) {
+                       $in_reply_to_id = ItemURI::getIdByURI($parameters['item']['thr-parent']);
+               } else {
+                       $in_reply_to_id= null;
+               }
+
+               return new \Friendica\Object\Api\Mastodon\ScheduledStatus($delayed_post, $parameters, $media_ids, $in_reply_to_id);
        }
 }

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 30e666898777c5b4a9c245d5a31b611b9373b932..26369a3540f0f4c5153188c1430f32547a92ed80 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -841,13 +841,28 @@ class Photo
         * @throws \Exception
         */
        public static function isLocal($name)
+       {
+               return (bool)self::getIdForName($name);
+       }
+
+       /**
+        * Return the id of a local photo
+        *
+        * @param string $name Picture link
+        * @return int
+        */
+       public static function getIdForName($name)
        {
                $data = self::getResourceData($name);
                if (empty($data)) {
-                       return false;
+                       return 0;
                }
 
-               return DBA::exists('photo', ['resource-id' => $data['guid'], 'scale' => $data['scale']]);
+               $photo = DBA::selectFirst('photo', ['id'], ['resource-id' => $data['guid'], 'scale' => $data['scale']]);
+               if (!empty($photo['id'])) {
+                       return $photo['id'];
+               }
+               return 0;
        }
 
        /**

diff --git a/src/Model/Post/Delayed.php b/src/Model/Post/Delayed.php
index 49bf77a8346d9a8a64b139ddff035ea958ebb251..0bae1a8e2e7f014b03cbe5c63e601332c653a1ba 100644 (file)
--- a/src/Model/Post/Delayed.php
+++ b/src/Model/Post/Delayed.php
@@ -134,6 +134,12 @@ class Delayed
                        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],

diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php
index fab70738f0fb0709d22a6a01647466893eefd0ed..d18e51d9d51fa1e4969465055c06d74cd997497c 100644 (file)
--- a/src/Module/Api/Mastodon/ScheduledStatuses.php
+++ b/src/Module/Api/Mastodon/ScheduledStatuses.php
@@ -72,7 +72,7 @@ class ScheduledStatuses extends BaseApi
                $uid = self::getCurrentUserID();
 
                if (isset($parameters['id'])) {
-                               System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($parameters['id'], $uid)->toArray());
+                       System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($parameters['id'], $uid)->toArray());
                }
 
                $request = self::getRequest([

diff --git a/src/Object/Api/Mastodon/ScheduledStatus.php b/src/Object/Api/Mastodon/ScheduledStatus.php
index 473cd99a5436cb2cc9ab0fa92105f272579ab16c..e4f702a23414b6e9c3b3016178dbf8ab4fd7cf66 100644 (file)
--- a/src/Object/Api/Mastodon/ScheduledStatus.php
+++ b/src/Object/Api/Mastodon/ScheduledStatus.php
@@ -59,7 +59,7 @@ class ScheduledStatus extends BaseDataTransferObject
         * @param array $parameters   Parameters for the workerqueue entry for the delayed post
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function __construct(array $delayed_post, array $parameters)
+       public function __construct(array $delayed_post, array $parameters, array $media_ids = null, int $in_reply_to_id = null)
        {
                $visibility = ['public', 'private', 'unlisted'];
 
@@ -68,14 +68,14 @@ class ScheduledStatus extends BaseDataTransferObject
 
                $this->params = [
                        'text'           => BBCode::convert(BBCode::setMentionsToNicknames($parameters['item']['body'] ?? ''), false, BBCode::API),
-                       'media_ids'      => null,
+                       'media_ids'      => $media_ids,
                        'sensitive'      => null,
                        'spoiler_text'   => $parameters['item']['title'] ?? '',
                        'visibility'     => $visibility[$parameters['item']['private']],
                        'scheduled_at'   => $this->scheduled_at,
                        'poll'           => null,
                        'idempotency'    => null,
-                       'in_reply_to_id' => null,
+                       'in_reply_to_id' => $in_reply_to_id,
                        'application_id' => ''
                ];