From 492b92140a81c4ee07cb4b239ec994e75f8f35b6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 28 Dec 2022 19:42:25 -0700 Subject: [PATCH] Update DeleteAccountPipeline --- app/Jobs/DeletePipeline/DeleteAccountPipeline.php | 11 +++++------ app/Services/StatusService.php | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php index 8325fb630..652a8559b 100644 --- a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php +++ b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php @@ -78,6 +78,11 @@ class DeleteAccountPipeline implements ShouldQueue $user = $this->user; $profile = $user->profile; $id = $user->profile_id; + Status::whereProfileId($id)->chunk(50, function($statuses) { + foreach($statuses as $status) { + StatusDelete::dispatchNow($status); + } + }); $this->deleteUserColumns($user); AccountService::del($user->profile_id); @@ -169,12 +174,6 @@ class DeleteAccountPipeline implements ShouldQueue DB::table('oauth_auth_codes')->whereUserId($user->id)->delete(); ProfileSponsor::whereProfileId($id)->delete(); - Status::whereProfileId($id)->chunk(50, function($statuses) { - foreach($statuses as $status) { - StatusDelete::dispatch($status)->onQueue('high'); - } - }); - Report::whereUserId($user->id)->forceDelete(); PublicTimelineService::warmCache(true, 400); Profile::whereUserId($user->id)->delete(); diff --git a/app/Services/StatusService.php b/app/Services/StatusService.php index 9f8188ce6..d222ff260 100644 --- a/app/Services/StatusService.php +++ b/app/Services/StatusService.php @@ -137,9 +137,9 @@ class StatusService public static function del($id, $purge = false) { - $status = self::get($id); if($purge) { + $status = self::get($id); if($status && isset($status['account']) && isset($status['account']['id'])) { Cache::forget('profile:embed:' . $status['account']['id']); }