mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update ApiV1Controller, fix null caption on media bug

This commit is contained in:
Daniel Supernault 2024-10-05 20:45:32 -06:00
parent 9b8e7ff628
commit 424f0271c3
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/ApiV1Controller.php
View File

@ -1878,7 +1878,7 @@ class ApiV1Controller extends Controller
$media->original_sha256 = $hash; $media->original_sha256 = $hash;
$media->size = $photo->getSize(); $media->size = $photo->getSize();
$media->mime = $mime; $media->mime = $mime;
$media->caption = $request->input('description'); $media->caption = $request->input('description') ?? "";
$media->filter_class = $filterClass; $media->filter_class = $filterClass;
$media->filter_name = $filterName; $media->filter_name = $filterName;
if ($license) { if ($license) {
@ -2106,7 +2106,7 @@ class ApiV1Controller extends Controller
$media->original_sha256 = $hash; $media->original_sha256 = $hash;
$media->size = $photo->getSize(); $media->size = $photo->getSize();
$media->mime = $mime; $media->mime = $mime;
$media->caption = $request->input('description'); $media->caption = $request->input('description') ?? "";
$media->filter_class = $filterClass; $media->filter_class = $filterClass;
$media->filter_name = $filterName; $media->filter_name = $filterName;
if ($license) { if ($license) {

3
app/Http/Controllers/ComposeController.php
View File

@ -119,10 +119,11 @@ class ComposeController extends Controller
$media->media_path = $path; $media->media_path = $path;
$media->original_sha256 = $hash; $media->original_sha256 = $hash;
$media->size = $photo->getSize(); $media->size = $photo->getSize();
$media->caption = "";
$media->mime = $mime; $media->mime = $mime;
$media->filter_class = $filterClass; $media->filter_class = $filterClass;
$media->filter_name = $filterName; $media->filter_name = $filterName;
$media->version = 3; $media->version = '3';
$media->save(); $media->save();
$preview_url = $media->url().'?v='.time(); $preview_url = $media->url().'?v='.time();