From 58c87bdd7f37e80a57c4802e95eb6c572ccffed4 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Mon, 12 Dec 2022 11:22:19 +0000 Subject: [feature] allow uncaching of other media types (#1234) * simplify pruneRemote, remove unncecessary media trace logging, update RemoteOlderThan() to include headers/avis Signed-off-by: kim * cleanup pruneallmeta, add remote header to pruneremote tests Signed-off-by: kim * fix olderthan duration additions Signed-off-by: kim * fix broken test now that test model header changed Signed-off-by: kim * instead use new remote test account for new header model Signed-off-by: kim * use newer generated ULID for remote_account_3 to ensure it is sorted last Signed-off-by: kim * reorganize serialized keys to match expected test account model order Signed-off-by: kim Signed-off-by: kim --- internal/db/bundb/media.go | 3 +-- internal/db/bundb/media_test.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'internal/db/bundb') diff --git a/internal/db/bundb/media.go b/internal/db/bundb/media.go index 39e0ad0e3..3be7be39a 100644 --- a/internal/db/bundb/media.go +++ b/internal/db/bundb/media.go @@ -57,8 +57,6 @@ func (m *mediaDB) GetRemoteOlderThan(ctx context.Context, olderThan time.Time, l NewSelect(). Model(&attachments). Where("? = ?", bun.Ident("media_attachment.cached"), true). - Where("? = ?", bun.Ident("media_attachment.avatar"), false). - Where("? = ?", bun.Ident("media_attachment.header"), false). Where("? < ?", bun.Ident("media_attachment.created_at"), olderThan). WhereGroup(" AND ", whereNotEmptyAndNotNull("media_attachment.remote_url")). Order("media_attachment.created_at DESC") @@ -70,6 +68,7 @@ func (m *mediaDB) GetRemoteOlderThan(ctx context.Context, olderThan time.Time, l 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 d6a4981f8..1676954ce 100644 --- a/internal/db/bundb/media_test.go +++ b/internal/db/bundb/media_test.go @@ -41,7 +41,7 @@ func (suite *MediaTestSuite) TestGetAttachmentByID() { func (suite *MediaTestSuite) TestGetOlder() { attachments, err := suite.db.GetRemoteOlderThan(context.Background(), time.Now(), 20) suite.NoError(err) - suite.Len(attachments, 2) + suite.Len(attachments, 3) } func (suite *MediaTestSuite) TestGetAvisAndHeaders() { @@ -49,7 +49,7 @@ func (suite *MediaTestSuite) TestGetAvisAndHeaders() { attachments, err := suite.db.GetAvatarsAndHeaders(ctx, "", 20) suite.NoError(err) - suite.Len(attachments, 2) + suite.Len(attachments, 3) } func (suite *MediaTestSuite) TestGetLocalUnattachedOlderThan() { -- cgit v1.2.3