]> git.mxchange.org Git - friendica.git/commitdiff
Fix upload error handling for media
authorArt4 <art4@wlabs.de>
Thu, 6 Mar 2025 11:57:29 +0000 (11:57 +0000)
committerArt4 <art4@wlabs.de>
Thu, 6 Mar 2025 11:57:29 +0000 (11:57 +0000)
see https://github.com/friendica/friendica/pull/14475
refs #14475

src/Module/Api/Mastodon/Media.php

index f9d61e0db3a0f5a612bb8234c5216e813962e501..df6c5210083308da7953824770e15e4cdc8163eb 100644 (file)
@@ -44,12 +44,13 @@ class Media extends BaseApi
 
                if (in_array($type, [Post\Media::IMAGE, Post\Media::UNKNOWN, Post\Media::APPLICATION])) {
                        $media = Photo::upload($uid, $request['file'], '', null, null, '', '', $request['description']);
-                       if (!empty($media)) {
-                               $this->logger->info('Uploaded photo', ['media' => $media]);
-                               $this->jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
-                       } elseif ($type == Post\Media::IMAGE) {
-                               $this->jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
+
+                       if (empty($media)) {
+                               $this->logAndJsonError(500, $this->errorFactory->InternalError('Error while uploading media.'));
                        }
+
+                       $this->logger->info('Uploaded photo', ['media' => $media]);
+                       $this->jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
                }
 
                $tempFileName = $request['file']['tmp_name'];