From 93077625ca39064b318d85b452002c86db0cb03a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 3 Mar 2023 04:54:28 -0700 Subject: [PATCH 1/3] Update IncrementPostCount job --- .../ProfilePipeline/IncrementPostCount.php | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/app/Jobs/ProfilePipeline/IncrementPostCount.php b/app/Jobs/ProfilePipeline/IncrementPostCount.php index 554a4c149..9c7585e25 100644 --- a/app/Jobs/ProfilePipeline/IncrementPostCount.php +++ b/app/Jobs/ProfilePipeline/IncrementPostCount.php @@ -14,45 +14,47 @@ use App\Services\AccountService; class IncrementPostCount implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - public $id; + public $id; - /** - * Create a new job instance. - * - * @return void - */ - public function __construct($id) - { - $this->id = $id; - } + /** + * Create a new job instance. + * + * @return void + */ + public function __construct($id) + { + $this->id = $id; + } - /** - * Execute the job. - * - * @return void - */ - public function handle() - { - $id = $this->id; + /** + * Execute the job. + * + * @return void + */ + public function handle() + { + $id = $this->id; - $profile = Profile::find($id); + $profile = Profile::find($id); - if(!$profile) { - return 1; - } + if(!$profile) { + return 1; + } - if($profile->updated_at && $profile->updated_at->lt(now()->subDays(30))) { - $profile->status_count = Status::whereProfileId($id)->whereNull(['in_reply_to_id', 'reblog_of_id'])->count(); - $profile->save(); - AccountService::del($id); - } else { - $profile->status_count = $profile->status_count + 1; - $profile->save(); - AccountService::del($id); - } + if($profile->updated_at && $profile->updated_at->lt(now()->subDays(30))) { + $profile->status_count = Status::whereProfileId($id)->whereNull(['in_reply_to_id', 'reblog_of_id'])->count(); + $profile->last_status_at = now(); + $profile->save(); + AccountService::del($id); + } else { + $profile->status_count = $profile->status_count + 1; + $profile->last_status_at = now(); + $profile->save(); + AccountService::del($id); + } - return 1; - } + return 1; + } } From f31646502faadc7d77f524686f7e608000544aa5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 3 Mar 2023 21:22:35 -0700 Subject: [PATCH 2/3] Update ApiV1Controller, fix media update. Fixes #4196 --- app/Http/Controllers/Api/ApiV1Controller.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 19fef9d22..85f5f55ae 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1628,7 +1628,10 @@ class ApiV1Controller extends Controller ], 429); }; - return $this->json(MediaService::get($media->status_id)); + $fractal = new Fractal\Manager(); + $fractal->setSerializer(new ArraySerializer()); + $resource = new Fractal\Resource\Item($media, new MediaTransformer()); + return $this->json($fractal->createData($resource)->toArray()); } /** From cd1ef7865cd8557c1f6f21e54d2e67c79d053e95 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 3 Mar 2023 21:23:23 -0700 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ed6cc22..cb48a315b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -111,6 +111,11 @@ - Update PostReactions, reduce bookmark timeout to 2s from 5s ([a8094e6c](https://github.com/pixelfed/pixelfed/commit/a8094e6c)) - Update CollectionController, fixes #3946 ([abd52f4d](https://github.com/pixelfed/pixelfed/commit/abd52f4d)) - Update ComposeController, fix add to collection logic ([9f8957b9](https://github.com/pixelfed/pixelfed/commit/9f8957b9)) +- Update v1.1 api, add post moderation endpoint ([9bbd6dcd](https://github.com/pixelfed/pixelfed/commit/9bbd6dcd)) +- Update StatusService, on purge remove from NetworkTimelineService cache ([18940cb2](https://github.com/pixelfed/pixelfed/commit/18940cb2)) +- Update mute/block logic with admin defined limits and improved filtering to skip deleted accounts ([5b879f01](https://github.com/pixelfed/pixelfed/commit/5b879f01)) +- Update FollowPipeline, fix followers_count and following_count counters ([6153b620](https://github.com/pixelfed/pixelfed/commit/6153b620)) +- Update ApiV1Controller, fix media update. Fixes #4196 ([f3164650](https://github.com/pixelfed/pixelfed/commit/f3164650)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)