From b143877995220022787cc265801608f1548ff490 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sun, 15 May 2022 16:45:04 +0200
Subject: [feature] Unused avatar and header cleanup (#574)
* rename + tidy up remote pruning
* fix media attachment account join
see https://bun.uptrace.dev/guide/golang-orm.html#table-relationships
* update logging to new function name
* add get avatars and headers to bun
* add pruneallmeta function
* don't set uncached since we're deleting anyway
* fix totalPruned being in wrong place
* test pruning meta
* go fmt ./...
* rename mediaprune
* add meta pruning to routine mediaprune
* tidy up cleanup job scheduling
* rename adminmediaremoteprune
* update mediacleanup to use renamed prune func
* update swagger docs a little bit
* reuse cancel + context
---
internal/processing/admin/admin.go | 2 +-
internal/processing/admin/mediaprune.go | 54 +++++++++++++++++++++++++++
internal/processing/admin/mediaremoteprune.go | 45 ----------------------
3 files changed, 55 insertions(+), 46 deletions(-)
create mode 100644 internal/processing/admin/mediaprune.go
delete mode 100644 internal/processing/admin/mediaremoteprune.go
(limited to 'internal/processing/admin')
diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go
index 6779f59b7..c528f0fb8 100644
--- a/internal/processing/admin/admin.go
+++ b/internal/processing/admin/admin.go
@@ -41,7 +41,7 @@ type Processor interface {
DomainBlockDelete(ctx context.Context, account *gtsmodel.Account, id string) (*apimodel.DomainBlock, gtserror.WithCode)
AccountAction(ctx context.Context, account *gtsmodel.Account, form *apimodel.AdminAccountActionRequest) gtserror.WithCode
EmojiCreate(ctx context.Context, account *gtsmodel.Account, user *gtsmodel.User, form *apimodel.EmojiCreateRequest) (*apimodel.Emoji, gtserror.WithCode)
- MediaRemotePrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode
+ MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode
}
type processor struct {
diff --git a/internal/processing/admin/mediaprune.go b/internal/processing/admin/mediaprune.go
new file mode 100644
index 000000000..0e6abe028
--- /dev/null
+++ b/internal/processing/admin/mediaprune.go
@@ -0,0 +1,54 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package admin
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/sirupsen/logrus"
+ "github.com/superseriousbusiness/gotosocial/internal/gtserror"
+)
+
+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())
+ }
+
+ go func() {
+ pruned, err := p.mediaManager.PruneAllRemote(ctx, mediaRemoteCacheDays)
+ if err != nil {
+ logrus.Errorf("MediaPrune: error pruning remote cache: %s", err)
+ } else {
+ logrus.Infof("MediaPrune: pruned %d remote cache entries", pruned)
+ }
+ }()
+
+ go func() {
+ pruned, err := p.mediaManager.PruneAllMeta(ctx)
+ if err != nil {
+ logrus.Errorf("MediaPrune: error pruning meta: %s", err)
+ } else {
+ logrus.Infof("MediaPrune: pruned %d meta entries", pruned)
+ }
+ }()
+
+ return nil
+}
diff --git a/internal/processing/admin/mediaremoteprune.go b/internal/processing/admin/mediaremoteprune.go
deleted file mode 100644
index e4a50cab8..000000000
--- a/internal/processing/admin/mediaremoteprune.go
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-*/
-
-package admin
-
-import (
- "context"
- "fmt"
-
- "github.com/sirupsen/logrus"
- "github.com/superseriousbusiness/gotosocial/internal/gtserror"
-)
-
-func (p *processor) MediaRemotePrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode {
- if mediaRemoteCacheDays < 0 {
- err := fmt.Errorf("invalid value for mediaRemoteCacheDays prune: value was %d, cannot be less than 0", mediaRemoteCacheDays)
- return gtserror.NewErrorBadRequest(err, err.Error())
- }
-
- go func() {
- pruned, err := p.mediaManager.PruneRemote(ctx, mediaRemoteCacheDays)
- if err != nil {
- logrus.Errorf("MediaRemotePrune: error pruning: %s", err)
- } else {
- logrus.Infof("MediaRemotePrune: pruned %d entries", pruned)
- }
- }()
-
- return nil
-}
--
cgit v1.2.3