Merge pull request #261 from factly/fix/medium-proxy-url

added bucket name env variable
factly · Sep 7, 2022 · fdb58bb · fdb58bb
2 parents e52869c + 0ad2555
commit fdb58bb
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/server/model/medium.go b/server/model/medium.go
@@ -2,7 +2,9 @@ package model
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/url"
+	"strings"
 
 	"github.com/jinzhu/gorm/dialects/postgres"
 	"github.com/spf13/viper"
@@ -54,7 +56,11 @@ func (media *Medium) AfterCreate(tx *gorm.DB) (err error) {
 		_ = json.Unmarshal(media.URL.RawMessage, &resurl)
 		if rawURL, found := resurl["raw"]; found {
 			urlObj, _ := url.Parse(rawURL.(string))
-			resurl["proxy"] = viper.GetString("imageproxy_url") + urlObj.Path
+			bucket_name := ""
+			if viper.IsSet("bucket_name") {
+				bucket_name = fmt.Sprint(viper.GetString("bucket_name"), "/")
+			}
+			resurl["proxy"] = strings.Replace(viper.GetString("imageproxy_url")+urlObj.Path, bucket_name, "", 1)
 
 			rawBArr, _ := json.Marshal(resurl)
 			media.URL = postgres.Jsonb{
@@ -72,7 +78,11 @@ func (media *Medium) AfterFind(tx *gorm.DB) (err error) {
 		_ = json.Unmarshal(media.URL.RawMessage, &resurl)
 		if rawURL, found := resurl["raw"]; found {
 			urlObj, _ := url.Parse(rawURL.(string))
-			resurl["proxy"] = viper.GetString("imageproxy_url") + urlObj.Path
+			bucket_name := ""
+			if viper.IsSet("bucket_name") {
+				bucket_name = fmt.Sprint(viper.GetString("bucket_name"), "/")
+			}
+			resurl["proxy"] = strings.Replace(viper.GetString("imageproxy_url")+urlObj.Path, bucket_name, "", 1)
 
 			rawBArr, _ := json.Marshal(resurl)
 			media.URL = postgres.Jsonb{