Pārlūkot izejas kodu

Merge pull request #6154 from pixelfed/staging

Staging
(dan)iel (sup)ernault 2 nedēļas atpakaļ
vecāks
revīzija
1caef8383a
2 mainītis faili ar 5 papildinājumiem un 1 dzēšanām
  1. 3 0
      CHANGELOG.md
  2. 2 1
      app/Http/Controllers/Api/ApiV1Dot1Controller.php

+ 3 - 0
CHANGELOG.md

@@ -74,6 +74,9 @@
 - Update StoryIndexService, improve redis compatability ([dbba52303](https://github.com/pixelfed/pixelfed/commit/dbba52303))
 - Update StoryFetch, fix mass assignment bug preventing proper model creation ([1e3147028](https://github.com/pixelfed/pixelfed/commit/1e3147028))
 - Update StoryRotateMedia job, handle StoryIndexService cache invalidation ([e2a64c730](https://github.com/pixelfed/pixelfed/commit/e2a64c730))
+- Update ApiV1StoryController, fix viewer pagination ([5d4674daa](https://github.com/pixelfed/pixelfed/commit/5d4674daa))
+- Update StoryApiV1Controller, reduce min story size to 10kb ([f195102b3](https://github.com/pixelfed/pixelfed/commit/f195102b3))
+- Update ApiV1Dot1Controller, fix Story report follower check ([ec21eec50](https://github.com/pixelfed/pixelfed/commit/ec21eec50))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.12.5 (2025-03-23)](https://github.com/pixelfed/pixelfed/compare/v0.12.5...dev)

+ 2 - 1
app/Http/Controllers/Api/ApiV1Dot1Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\AccountLog;
 use App\EmailVerification;
+use App\Follower;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\StatusController;
 use App\Http\Resources\StatusStateless;
@@ -154,7 +155,7 @@ class ApiV1Dot1Controller extends Controller
                 if ($object->profile_id == $user->profile_id) {
                     return $this->error('Cannot self report', 400, ['error_code' => 'ERROR_NO_SELF_REPORTS']);
                 }
-                if (! FollowerService::follows($user->profile_id, $object->profile_id)) {
+                if (! Follower::whereProfileId($user->profile_id)->whereFollowingId($object->profile_id)->exists()) {
                     return $this->error('Invalid object id', 400, ['error_code' => 'ERROR_INVALID_OBJECT_ID']);
                 }
                 $object_type = 'App\Story';