diff --git a/CHANGELOG.md b/CHANGELOG.md index 91bbcfcb3..2340ca3a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ - Fix mastoapi notification type casting to include comment and share (mention and reblog) notifications ([eba84530](https://github.com/pixelfed/pixelfed/commit/eba84530)) - Fix email verification requests filtering to gracefully handle deleted accounts and accounts already verified ([b57066d1](https://github.com/pixelfed/pixelfed/commit/b57066d1)) - Add configuration to v1/instance endpoint. Fixes #3605 ([2fb18b7d](https://github.com/pixelfed/pixelfed/commit/2fb18b7d)) +- Fix remote account post counts ([149cf9dc](https://github.com/pixelfed/pixelfed/commit/149cf9dc)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) diff --git a/app/Console/Commands/FixRemotePostCount.php b/app/Console/Commands/FixRemotePostCount.php new file mode 100644 index 000000000..71b20ecf1 --- /dev/null +++ b/app/Console/Commands/FixRemotePostCount.php @@ -0,0 +1,53 @@ +chunk(50, function($profiles) { + foreach($profiles as $profile) { + $count = Status::whereNull(['in_reply_to_id', 'reblog_of_id'])->whereProfileId($profile->id)->count(); + $this->info("Checking {$profile->id} {$profile->username} - found {$count} statuses"); + $profile->status_count = $count; + $profile->save(); + } + }); + + return 0; + } +} diff --git a/app/Jobs/ProfilePipeline/DecrementPostCount.php b/app/Jobs/ProfilePipeline/DecrementPostCount.php new file mode 100644 index 000000000..d6781d7a5 --- /dev/null +++ b/app/Jobs/ProfilePipeline/DecrementPostCount.php @@ -0,0 +1,58 @@ +id = $id; + } + + /** + * Execute the job. + * + * @return void + */ + public function handle() + { + $id = $this->id; + + $profile = Profile::find($id); + + 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 ? $profile->status_count - 1 : 0; + $profile->save(); + AccountService::del($id); + } + + return 1; + } +} diff --git a/app/Jobs/ProfilePipeline/IncrementPostCount.php b/app/Jobs/ProfilePipeline/IncrementPostCount.php new file mode 100644 index 000000000..554a4c149 --- /dev/null +++ b/app/Jobs/ProfilePipeline/IncrementPostCount.php @@ -0,0 +1,58 @@ +id = $id; + } + + /** + * Execute the job. + * + * @return void + */ + public function handle() + { + $id = $this->id; + + $profile = Profile::find($id); + + 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); + } + + return 1; + } +} diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index b6fea3b29..e00f618ff 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -38,6 +38,8 @@ use App\Jobs\AvatarPipeline\RemoteAvatarFetch; use App\Util\Media\License; use App\Models\Poll; use Illuminate\Contracts\Cache\LockTimeoutException; +use App\Jobs\ProfilePipeline\IncrementPostCount; +use App\Jobs\ProfilePipeline\DecrementPostCount; class Helpers { @@ -501,6 +503,8 @@ class Helpers { NetworkTimelineService::add($status->id); } + IncrementPostCount::dispatch($pid)->onQueue('low'); + return $status; }); } diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index e75a5228b..a5046a529 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -38,6 +38,8 @@ use App\Services\PollService; use App\Services\FollowerService; use App\Services\StatusService; use App\Models\Conversation; +use App\Jobs\ProfilePipeline\IncrementPostCount; +use App\Jobs\ProfilePipeline\DecrementPostCount; class Inbox { @@ -655,6 +657,7 @@ class Inbox $status->likes()->delete(); $status->shares()->delete(); $status->delete(); + DecrementPostCount::dispatch($profile->id)->onQueue('low'); return; break;