浏览代码

Update ApiV1Controller, fix bookmark bug. Closes #5216

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

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

@@ -1878,7 +1878,7 @@ class ApiV1Controller extends Controller
         $media->original_sha256 = $hash;
         $media->size = $photo->getSize();
         $media->mime = $mime;
-        $media->caption = $request->input('description') ?? "";
+        $media->caption = $request->input('description') ?? '';
         $media->filter_class = $filterClass;
         $media->filter_name = $filterName;
         if ($license) {
@@ -2106,7 +2106,7 @@ class ApiV1Controller extends Controller
         $media->original_sha256 = $hash;
         $media->size = $photo->getSize();
         $media->mime = $mime;
-        $media->caption = $request->input('description') ?? "";
+        $media->caption = $request->input('description') ?? '';
         $media->filter_class = $filterClass;
         $media->filter_name = $filterName;
         if ($license) {
@@ -3951,6 +3951,7 @@ class ApiV1Controller extends Controller
         abort_unless($request->user()->tokenCan('write'), 403);
 
         $status = Status::findOrFail($id);
+        $user = $request->user();
         $pid = $request->user()->profile_id;
         $account = AccountService::get($status->profile_id);
         abort_if(isset($account['moved'], $account['moved']['id']), 422, 'Cannot bookmark a post from an account that has migrated');
@@ -3994,6 +3995,7 @@ class ApiV1Controller extends Controller
 
         $status = Status::findOrFail($id);
         $pid = $request->user()->profile_id;
+        $user = $request->user();
 
         abort_if($user->has_roles && ! UserRoleService::can('can-bookmark', $user->id), 403, 'Invalid permissions for this action');
         abort_if($status->in_reply_to_id || $status->reblog_of_id, 404);