diff options
Diffstat (limited to 'internal/media/processimage.go')
| -rw-r--r-- | internal/media/processimage.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/internal/media/processimage.go b/internal/media/processimage.go index 03bd4eda8..f3b520ad9 100644 --- a/internal/media/processimage.go +++ b/internal/media/processimage.go @@ -24,6 +24,8 @@ import ( "strings" "time" + "github.com/spf13/viper" + "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" ) @@ -67,7 +69,12 @@ func (mh *mediaHandler) processImageAttachment(data []byte, minAttachment *gtsmo return nil, err } - URLbase := fmt.Sprintf("%s://%s%s", mh.config.StorageConfig.ServeProtocol, mh.config.StorageConfig.ServeHost, mh.config.StorageConfig.ServeBasePath) + keys := config.Keys + serveProtocol := viper.GetString(keys.StorageServeProtocol) + serveHost := viper.GetString(keys.StorageServeHost) + serveBasePath := viper.GetString(keys.StorageServeBasePath) + + URLbase := fmt.Sprintf("%s://%s%s", serveProtocol, serveHost, serveBasePath) originalURL := fmt.Sprintf("%s/%s/attachment/original/%s.%s", URLbase, minAttachment.AccountID, newMediaID, extension) smallURL := fmt.Sprintf("%s/%s/attachment/small/%s.jpeg", URLbase, minAttachment.AccountID, newMediaID) // all thumbnails/smalls are encoded as jpeg |