summaryrefslogtreecommitdiff
path: root/internal/db
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-05-15 16:45:04 +0200
committerLibravatar GitHub <noreply@github.com>2022-05-15 15:45:04 +0100
commitb143877995220022787cc265801608f1548ff490 (patch)
treeb51238caca4d022c96cd98ea35f9e5a9be25f95c /internal/db
parent[feature] Media cleanup endpoint (#560) (diff)
downloadgotosocial-b143877995220022787cc265801608f1548ff490.tar.xz
[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
Diffstat (limited to 'internal/db')
-rw-r--r--internal/db/bundb/media.go26
-rw-r--r--internal/db/bundb/media_test.go8
-rw-r--r--internal/db/media.go3
3 files changed, 37 insertions, 0 deletions
diff --git a/internal/db/bundb/media.go b/internal/db/bundb/media.go
index 4da80e757..fc3280ddf 100644
--- a/internal/db/bundb/media.go
+++ b/internal/db/bundb/media.go
@@ -72,3 +72,29 @@ func (m *mediaDB) GetRemoteOlderThan(ctx context.Context, olderThan time.Time, l
}
return attachments, nil
}
+
+func (m *mediaDB) GetAvatarsAndHeaders(ctx context.Context, maxID string, limit int) ([]*gtsmodel.MediaAttachment, db.Error) {
+ attachments := []*gtsmodel.MediaAttachment{}
+
+ q := m.newMediaQ(&attachments).
+ WhereGroup(" AND ", func(innerQ *bun.SelectQuery) *bun.SelectQuery {
+ return innerQ.
+ WhereOr("media_attachment.avatar = true").
+ WhereOr("media_attachment.header = true")
+ }).
+ Order("media_attachment.id DESC")
+
+ if maxID != "" {
+ q = q.Where("media_attachment.id < ?", maxID)
+ }
+
+ if limit != 0 {
+ q = q.Limit(limit)
+ }
+
+ if err := q.Scan(ctx); err != nil {
+ return nil, m.conn.ProcessError(err)
+ }
+
+ return attachments, nil
+}
diff --git a/internal/db/bundb/media_test.go b/internal/db/bundb/media_test.go
index 3138caf3b..f1809b3fb 100644
--- a/internal/db/bundb/media_test.go
+++ b/internal/db/bundb/media_test.go
@@ -43,6 +43,14 @@ func (suite *MediaTestSuite) TestGetOlder() {
suite.Len(attachments, 2)
}
+func (suite *MediaTestSuite) TestGetAvisAndHeaders() {
+ ctx := context.Background()
+
+ attachments, err := suite.db.GetAvatarsAndHeaders(ctx, "", 20)
+ suite.NoError(err)
+ suite.Len(attachments, 2)
+}
+
func TestMediaTestSuite(t *testing.T) {
suite.Run(t, new(MediaTestSuite))
}
diff --git a/internal/db/media.go b/internal/db/media.go
index c734502a1..636fc61f2 100644
--- a/internal/db/media.go
+++ b/internal/db/media.go
@@ -35,4 +35,7 @@ type Media interface {
// The selected media attachments will be those with both a URL and a RemoteURL filled in.
// In other words, media attachments that originated remotely, and that we currently have cached locally.
GetRemoteOlderThan(ctx context.Context, olderThan time.Time, limit int) ([]*gtsmodel.MediaAttachment, Error)
+ // GetAvatarsAndHeaders fetches limit n avatars and headers with an id < maxID. These headers
+ // and avis may be in use or not; the caller should check this if it's important.
+ GetAvatarsAndHeaders(ctx context.Context, maxID string, limit int) ([]*gtsmodel.MediaAttachment, Error)
}