diff options
Diffstat (limited to 'internal/processing/media')
| -rw-r--r-- | internal/processing/media/getfile.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/internal/processing/media/getfile.go b/internal/processing/media/getfile.go index 9501706fb..9843d6714 100644 --- a/internal/processing/media/getfile.go +++ b/internal/processing/media/getfile.go @@ -232,10 +232,13 @@ func (p *processor) getEmojiContent(ctx context.Context, fileName string, owning } func (p *processor) retrieveFromStorage(ctx context.Context, storagePath string, content *apimodel.Content) (*apimodel.Content, gtserror.WithCode) { + // If running on S3 storage with proxying disabled then + // just fetch a pre-signed URL instead of serving the content. if url := p.storage.URL(ctx, storagePath); url != nil { content.URL = url return content, nil } + reader, err := p.storage.GetStream(ctx, storagePath) if err != nil { return nil, gtserror.NewErrorNotFound(fmt.Errorf("error retrieving from storage: %s", err)) |