summaryrefslogtreecommitdiff
path: root/internal/api/model/content.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2023-02-16 14:18:53 +0100
committerLibravatar GitHub <noreply@github.com>2023-02-16 13:18:53 +0000
commit6ee0dc8c7df5486fd7c130a1f70712cfdd813bc4 (patch)
treefc99a51689dda8d1abd2f60d3c0641abe4c7f8a0 /internal/api/model/content.go
parentFix 410 Gone race on account deletes (#1507) (diff)
downloadgotosocial-6ee0dc8c7df5486fd7c130a1f70712cfdd813bc4.tar.xz
[bugfix] Set cache-control max-age dynamically for s3 (#1510)
* [bugfix] set cache-control max-age dynamically for s3 * woops * double whoops * time until, thank you linter, bless you, you're the best, no matter what kim says * aa
Diffstat (limited to 'internal/api/model/content.go')
-rw-r--r--internal/api/model/content.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/api/model/content.go b/internal/api/model/content.go
index 4c0151c2c..0f8f73f1d 100644
--- a/internal/api/model/content.go
+++ b/internal/api/model/content.go
@@ -20,8 +20,9 @@ package model
import (
"io"
- "net/url"
"time"
+
+ "github.com/superseriousbusiness/gotosocial/internal/storage"
)
// Content wraps everything needed to serve a blob of content (some kind of media) through the API.
@@ -35,7 +36,7 @@ type Content struct {
// Actual content
Content io.ReadCloser
// Resource URL to forward to if the file can be fetched from the storage directly (e.g signed S3 URL)
- URL *url.URL
+ URL *storage.PresignedURL
}
// GetContentRequestForm describes a piece of content desired by the caller of the fileserver API.