summaryrefslogtreecommitdiff
path: root/internal/db/bundb/media.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2022-12-12 11:22:19 +0000
committerLibravatar GitHub <noreply@github.com>2022-12-12 12:22:19 +0100
commit58c87bdd7f37e80a57c4802e95eb6c572ccffed4 (patch)
treeecfa90c1249adbd02b386f624b9dbf3c405cafd6 /internal/db/bundb/media.go
parent[chore]: Bump golang.org/x/image from 0.1.0 to 0.2.0 (#1252) (diff)
downloadgotosocial-58c87bdd7f37e80a57c4802e95eb6c572ccffed4.tar.xz
[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 <grufwub@gmail.com> * cleanup pruneallmeta, add remote header to pruneremote tests Signed-off-by: kim <grufwub@gmail.com> * fix olderthan duration additions Signed-off-by: kim <grufwub@gmail.com> * fix broken test now that test model header changed Signed-off-by: kim <grufwub@gmail.com> * instead use new remote test account for new header model Signed-off-by: kim <grufwub@gmail.com> * use newer generated ULID for remote_account_3 to ensure it is sorted last Signed-off-by: kim <grufwub@gmail.com> * reorganize serialized keys to match expected test account model order Signed-off-by: kim <grufwub@gmail.com> Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/db/bundb/media.go')
-rw-r--r--internal/db/bundb/media.go3
1 files changed, 1 insertions, 2 deletions
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
}