replace domain for links
All checks were successful
/ Make image (push) Successful in 1m35s

This commit is contained in:
nquidox 2025-10-18 16:07:56 +03:00
parent bb305eab9e
commit f3d123ee3b
2 changed files with 14 additions and 6 deletions

View file

@ -21,7 +21,7 @@ type Deps struct {
func NewHandler(deps Deps) *Handler { func NewHandler(deps Deps) *Handler {
packageBucketName := "user-merch-images" packageBucketName := "user-merch-images"
expires := time.Minute * 1 expires := time.Minute * 5
r := NewRepo(deps.DB) r := NewRepo(deps.DB)
s := newService(r, deps.Media, packageBucketName, expires) s := newService(r, deps.Media, packageBucketName, expires)

View file

@ -7,7 +7,6 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"io" "io"
"net/url" "net/url"
"strings"
"time" "time"
) )
@ -46,12 +45,21 @@ func (s *Service) Get(ctx context.Context, bucket, object string, expires time.D
return "", err return "", err
} }
link := presigned.String() u, err := url.Parse(presigned.String())
if s.domain != "" { if err != nil {
link = strings.Replace(link, fmt.Sprintf("http://%s", s.endpoint), s.domain, 1) return "", err
} }
return link, nil if s.domain != "" {
domainURL, err := url.Parse(s.domain)
if err != nil {
return "", fmt.Errorf("invalid domain URL: %w", err)
}
u.Scheme = domainURL.Scheme
u.Host = domainURL.Host
}
return u.String(), nil
} }
func (s *Service) Delete(ctx context.Context, bucket, object string) error { func (s *Service) Delete(ctx context.Context, bucket, object string) error {