Reenable Twitter/Statuses tests

[friendica.git] / src / Module / Api / Twitter / Statuses / Update.php

diff --git a/src/Module/Api/Twitter/Statuses/Update.php b/src/Module/Api/Twitter/Statuses/Update.php
index 25dbab882d9a34976e0cd24fc22e8d93b3309dc1..18cb932f80bc74966bd4355bc59dc6c943149be0 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Update.php
+++ b/src/Module/Api/Twitter/Statuses/Update.php
@@ -56,7 +56,7 @@ class Update extends BaseApi
                        'in_reply_to_status_id' => 0,
                        'lat'                   => 0,
                        'long'                  => 0,
-                       'media_ids'             => [],
+                       'media_ids'             => '',
                        'source'                => '',
                        'include_entities'      => false,
                ], $request);
@@ -127,9 +127,9 @@ class Update extends BaseApi
                        $item['object-type'] = Activity\ObjectType::NOTE;
                }
 
-               $ids = $request['media_ids'];
-
-               if (!empty($_FILES['media'])) {
+               if (!empty($_REQUEST['media_ids'])) {
+                       $ids = explode(',', $_REQUEST['media_ids']);
+               } elseif (!empty($_FILES['media'])) {
                        // upload the image if we have one
                        $picture = Photo::upload($uid, $_FILES['media']);
                        if (!empty($picture)) {
@@ -154,16 +154,19 @@ class Update extends BaseApi
                                Photo::setPermissionForRessource($media[0]['resource-id'], $uid, $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']);
 
                                $ressources[] = $media[0]['resource-id'];
-                               $phototypes = Images::supportedTypes();
-                               $ext        = $phototypes[$media[0]['type']];
+                               $phototypes   = Images::supportedTypes();
+                               $ext          = $phototypes[$media[0]['type']];
 
-                               $attachment = ['type' => Post\Media::IMAGE, 'mimetype' => $media[0]['type'],
+                               $attachment = [
+                                       'type'        => Post\Media::IMAGE,
+                                       'mimetype'    => $media[0]['type'],
                                        'url'         => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . '.' . $ext,
                                        'size'        => $media[0]['datasize'],
                                        'name'        => $media[0]['filename'] ?: $media[0]['resource-id'],
                                        'description' => $media[0]['desc'] ?? '',
                                        'width'       => $media[0]['width'],
-                                       'height'      => $media[0]['height']];
+                                       'height'      => $media[0]['height']
+                               ];
 
                                if (count($media) > 1) {
                                        $attachment['preview']        = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . '.' . $ext;
@@ -181,6 +184,7 @@ class Update extends BaseApi
                                // output the post that we just posted.
                                $status_info = DI::twitterStatus()->createFromUriId($item['uri-id'], $uid, $request['include_entities'])->toArray();
                                DI::apiResponse()->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+                               return;
                        }
                }
                DI::mstdnError()->InternalError();