From b2810fedf201dc9ae80ea8ec6d48e5cf7e21e6ea Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 18 May 2022 23:13:03 +0200
Subject: [bugfix] Clean up boosts of status when the status itself is deleted
 (#579)

* move status wiping logic to fromcommon.go

* delete reblogs of status when a status is deleted

* add admin boost of zork to test model

* update tests to make them more determinate

* Merge branch 'main' into status_reblog_cleanup

* move status wiping logic to fromcommon.go

* delete reblogs of status when a status is deleted

* add admin boost of zork to test model

* update tests to make them more determinate

* Merge branch 'main' into status_reblog_cleanup

* test status delete via client api

* go fmt
---
 internal/processing/fromclientapi.go | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'internal/processing/fromclientapi.go')

diff --git a/internal/processing/fromclientapi.go b/internal/processing/fromclientapi.go
index 4935f5627..13be84305 100644
--- a/internal/processing/fromclientapi.go
+++ b/internal/processing/fromclientapi.go
@@ -284,27 +284,7 @@ func (p *processor) processDeleteStatusFromClientAPI(ctx context.Context, client
 		statusToDelete.Account = clientMsg.OriginAccount
 	}
 
-	// delete all attachments for this status
-	for _, a := range statusToDelete.AttachmentIDs {
-		if err := p.mediaProcessor.Delete(ctx, a); err != nil {
-			return err
-		}
-	}
-
-	// delete all mentions for this status
-	for _, m := range statusToDelete.MentionIDs {
-		if err := p.db.DeleteByID(ctx, m, &gtsmodel.Mention{}); err != nil {
-			return err
-		}
-	}
-
-	// delete all notifications for this status
-	if err := p.db.DeleteWhere(ctx, []db.Where{{Key: "status_id", Value: statusToDelete.ID}}, &[]*gtsmodel.Notification{}); err != nil {
-		return err
-	}
-
-	// delete this status from any and all timelines
-	if err := p.deleteStatusFromTimelines(ctx, statusToDelete); err != nil {
+	if err := p.wipeStatus(ctx, statusToDelete); err != nil {
 		return err
 	}
 
-- 
cgit v1.2.3