diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-11-10 19:29:26 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-11-10 19:29:26 +0100 |
| commit | ba9d6b467a1f03447789844048d913738c843569 (patch) | |
| tree | 5a464ee4a33f26e3284179582ab6d3332d9d5388 /internal/cleaner | |
| parent | [chore/bugfix/horror] Allow `expires_in` and poll choices to be parsed from s... (diff) | |
| download | gotosocial-ba9d6b467a1f03447789844048d913738c843569.tar.xz | |
[feature] Media attachment placeholders (#2331)
* [feature] Use placeholders for unknown media types
* fix read of underreported small files
* switch to reduce nesting
* simplify cleanup
Diffstat (limited to 'internal/cleaner')
| -rw-r--r-- | internal/cleaner/media.go | 2 | ||||
| -rw-r--r-- | internal/cleaner/media_test.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/cleaner/media.go b/internal/cleaner/media.go index 9aca7aa20..6db205d13 100644 --- a/internal/cleaner/media.go +++ b/internal/cleaner/media.go @@ -290,7 +290,7 @@ func (m *Media) isOrphaned(ctx context.Context, path string) (bool, error) { case media.TypeEmoji: // Generate static URL for this emoji to lookup. - staticURL := uris.GenerateURIForAttachment( + staticURL := uris.URIForAttachment( pathParts[1], // instance account ID string(media.TypeEmoji), string(media.SizeStatic), diff --git a/internal/cleaner/media_test.go b/internal/cleaner/media_test.go index 20a643ea8..c1226bcb5 100644 --- a/internal/cleaner/media_test.go +++ b/internal/cleaner/media_test.go @@ -304,7 +304,7 @@ func (suite *MediaTestSuite) TestUncacheRemote() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) uncachedAttachment, err := suite.db.GetAttachmentByID(ctx, testStatusAttachment.ID) suite.NoError(err) @@ -327,7 +327,7 @@ func (suite *MediaTestSuite) TestUncacheRemoteDry() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(gtscontext.SetDryRun(ctx), after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) uncachedAttachment, err := suite.db.GetAttachmentByID(ctx, testStatusAttachment.ID) suite.NoError(err) @@ -344,7 +344,7 @@ func (suite *MediaTestSuite) TestUncacheRemoteTwice() { totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) // final uncache should uncache nothing, since the first uncache already happened totalUncachedAgain, err := suite.cleaner.Media().UncacheRemote(ctx, after) @@ -360,7 +360,7 @@ func (suite *MediaTestSuite) TestUncacheAndRecache() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) // media should no longer be stored _, err = suite.storage.Get(ctx, testStatusAttachment.File.Path) @@ -424,5 +424,5 @@ func (suite *MediaTestSuite) TestUncacheOneNonExistent() { after := time.Now().Add(-24 * time.Hour) totalUncached, err := suite.cleaner.Media().UncacheRemote(ctx, after) suite.NoError(err) - suite.Equal(2, totalUncached) + suite.Equal(3, totalUncached) } |