From fcbcd7ec73bb89bb56156fbc0dc929994444751e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 21 Dec 2023 01:53:49 -0700 Subject: [PATCH] Update Delete pipelines, delete status hashtags quietly --- app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php | 5 +---- app/Jobs/StatusPipeline/RemoteStatusDelete.php | 5 +---- app/Jobs/StatusPipeline/StatusDelete.php | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php b/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php index 353509c6c..824323cda 100644 --- a/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php +++ b/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php @@ -76,10 +76,7 @@ class DeleteRemoteStatusPipeline implements ShouldQueue }); Mention::whereStatusId($status->id)->forceDelete(); Report::whereObjectType('App\Status')->whereObjectId($status->id)->delete(); - $statusHashtags = StatusHashtag::whereStatusId($status->id)->get(); - foreach($statusHashtags as $stag) { - $stag->delete(); - } + StatusHashtag::whereStatusId($status->id)->deleteQuietly(); StatusView::whereStatusId($status->id)->delete(); Status::whereReblogOfId($status->id)->forceDelete(); $status->forceDelete(); diff --git a/app/Jobs/StatusPipeline/RemoteStatusDelete.php b/app/Jobs/StatusPipeline/RemoteStatusDelete.php index 78c41ed3d..9898d3c82 100644 --- a/app/Jobs/StatusPipeline/RemoteStatusDelete.php +++ b/app/Jobs/StatusPipeline/RemoteStatusDelete.php @@ -174,10 +174,7 @@ class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing ->whereObjectId($status->id) ->delete(); StatusArchived::whereStatusId($status->id)->delete(); - $statusHashtags = StatusHashtag::whereStatusId($status->id)->get(); - foreach($statusHashtags as $stag) { - $stag->delete(); - } + StatusHashtag::whereStatusId($status->id)->deleteQuietly(); StatusView::whereStatusId($status->id)->delete(); Status::whereInReplyToId($status->id)->update(['in_reply_to_id' => null]); diff --git a/app/Jobs/StatusPipeline/StatusDelete.php b/app/Jobs/StatusPipeline/StatusDelete.php index c0ced1368..a053bfe75 100644 --- a/app/Jobs/StatusPipeline/StatusDelete.php +++ b/app/Jobs/StatusPipeline/StatusDelete.php @@ -151,10 +151,7 @@ class StatusDelete implements ShouldQueue ->delete(); StatusArchived::whereStatusId($status->id)->delete(); - $statusHashtags = StatusHashtag::whereStatusId($status->id)->get(); - foreach($statusHashtags as $stag) { - $stag->delete(); - } + StatusHashtag::whereStatusId($status->id)->deleteQuietly(); StatusView::whereStatusId($status->id)->delete(); Status::whereInReplyToId($status->id)->update(['in_reply_to_id' => null]);