[bugfix/chore] oauth entropy fix + media cleanup tasks rewrite (#1853)

1 files changed, 7 insertions, 5 deletions

diff --git a/internal/processing/admin/media.go b/internal/processing/admin/media.go
index b8af183da..a457487b8 100644
--- a/internal/processing/admin/media.go
+++ b/internal/processing/admin/media.go
@@ -47,17 +47,19 @@ func (p *Processor) MediaRefetch(ctx context.Context, requestingAccount *gtsmode
 	return nil
 }
 
-// MediaPrune triggers a non-blocking prune of remote media, local unused media, etc.
+// MediaPrune triggers a non-blocking prune of unused media, orphaned, uncaching remote and fixing cache states.
 func (p *Processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode {
 	if mediaRemoteCacheDays < 0 {
 		err := fmt.Errorf("MediaPrune: invalid value for mediaRemoteCacheDays prune: value was %d, cannot be less than 0", mediaRemoteCacheDays)
 		return gtserror.NewErrorBadRequest(err, err.Error())
 	}
 
-	if err := p.mediaManager.PruneAll(ctx, mediaRemoteCacheDays, false); err != nil {
-		err = fmt.Errorf("MediaPrune: %w", err)
-		return gtserror.NewErrorInternalError(err)
-	}
+	// Start background task performing all media cleanup tasks.
+	go func() {
+		ctx := context.Background()
+		p.cleaner.Media().All(ctx, mediaRemoteCacheDays)
+		p.cleaner.Emoji().All(ctx)
+	}()
 
 	return nil
 }