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/media.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'internal/db/media.go') diff --git a/internal/db/media.go b/internal/db/media.go index 2f9ed79dc..2d4fbb441 100644 --- a/internal/db/media.go +++ b/internal/db/media.go @@ -29,18 +29,20 @@ import ( type Media interface { // GetAttachmentByID gets a single attachment by its ID GetAttachmentByID(ctx context.Context, id string) (*gtsmodel.MediaAttachment, Error) - // GetRemoteOlderThan gets limit n remote media attachments older than the given olderThan time. - // These will be returned in order of attachment.created_at descending (newest to oldest in other words). + + // GetRemoteOlderThan gets limit n remote media attachments (including avatars and headers) older than the given + // olderThan time. These will be returned in order of attachment.created_at descending (newest to oldest in other words). // // 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) - // GetLocalUnattachedOlderThan fetches limit n local media attachments, older than the given time, which - // aren't header or avatars, and aren't attached to a status. In other words, attachments which were uploaded - // but never used for whatever reason, or attachments that were attached to a status which was subsequently - // deleted. + + // GetLocalUnattachedOlderThan fetches limit n local media attachments (including avatars and headers), older than + // the given time, which aren't header or avatars, and aren't attached to a status. In other words, attachments which were + // uploaded but never used for whatever reason, or attachments that were attached to a status which was subsequently deleted. GetLocalUnattachedOlderThan(ctx context.Context, olderThan time.Time, maxID string, limit int) ([]*gtsmodel.MediaAttachment, Error) } -- cgit v1.2.3