浏览代码

Update ApiV1Controller, fix null caption on media bug

Daniel Supernault 9 月之前
父节点
当前提交
424f0271c3
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 2 2
      app/Http/Controllers/Api/ApiV1Controller.php
  2. 2 1
      app/Http/Controllers/ComposeController.php

+ 2 - 2
app/Http/Controllers/Api/ApiV1Controller.php

@@ -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) {

+ 2 - 1
app/Http/Controllers/ComposeController.php

@@ -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();