refactor: parametrize static & photo storage url

refactor: parametrize allow origins

3 files changed, 35 insertions, 19 deletions

diff --git a/internal/router/handlers/lang-blog-title.go b/internal/router/handlers/lang-blog-title.go
index f1be0a5..49744c1 100644
--- a/internal/router/handlers/lang-blog-title.go
+++ b/internal/router/handlers/lang-blog-title.go
@@ -74,7 +74,7 @@ func (r *BlogPageHandler) AddMeta(c *fiber.Ctx, supplements *router.Supplements,
 	return []router.MetaField{
 		{Property: "og:title", Content: metadata.Title},
 		{Property: "og:description", Content: fmt.Sprintf("%s [%s]", metadata.ShortDescription, metadata.ActionDate)},
-		{Property: "og:image", Content: fmt.Sprintf("https://f003.backblazeb2.com/file/sayana-photos/webp-320p/%s.webp", metadata.Thumbnail)},
+		{Property: "og:image", Content: fmt.Sprintf(supplements.PhotoStorage.Thumbnail320p.BaseUrl, metadata.Thumbnail)},
 		{Property: "og:url", Content: fmt.Sprintf("%s/%s/blog/%s", templateMap["CanonicalEndpoint"], lang, c.Params("title"))},
 		{Property: "og:type", Content: "website"},
 		{Name: "twitter:card", Content: "summary_large_image"},
diff --git a/internal/router/handlers/lang.go b/internal/router/handlers/lang.go
index c618353..25b5036 100644
--- a/internal/router/handlers/lang.go
+++ b/internal/router/handlers/lang.go
@@ -53,7 +53,10 @@ func (r *HomeHandler) AddMeta(c *fiber.Ctx, supplements *router.Supplements, lan
 	return []router.MetaField{
 		{Property: "og:title", Content: supplements.Localization[lang].HomePage.Header},
 		{Property: "og:description", Content: supplements.Localization[lang].HomePage.HomePageDescription},
-		{Property: "og:image", Content: fmt.Sprintf("https://f003.backblazeb2.com/file/sayana-static/home-page-gifs/otter-%d.gif", rand.Int()%3+1)},
+		{Property: "og:image", Content: fmt.Sprintf(
+			supplements.PhotoStorage.HomePageGifs.BaseUrl,
+			supplements.PhotoStorage.HomePageGifs.Indexes[rand.Int()%len(supplements.PhotoStorage.HomePageGifs.Indexes)],
+		)},
 		{Property: "og:url", Content: fmt.Sprintf("%s/%s", templateMap["CanonicalEndpoint"], lang)},
 		{Property: "og:type", Content: "website"},
 	}, nil
@@ -63,7 +66,10 @@ func (r *HomeHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplements,
 	templateMap["Title"] = supplements.Localization[lang].HomePage.Header
 	templateMap["FilledHeartCount"] = uint(40)
 	templateMap["OutlineHeartCount"] = uint(40)
-	templateMap["GifName"] = fmt.Sprintf("otter-%d.gif", rand.Int()%3+1)
+	templateMap["GifUrl"] = fmt.Sprintf(
+		supplements.PhotoStorage.HomePageGifs.BaseUrl,
+		supplements.PhotoStorage.HomePageGifs.Indexes[rand.Int()%len(supplements.PhotoStorage.HomePageGifs.Indexes)],
+	)
 	templateMap["FunFacts"] = supplements.FactGiver.Give(lang)
 	return fiber.StatusOK, nil
 }
diff --git a/internal/router/router.go b/internal/router/router.go
index e8fb47a..926d21a 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -101,6 +101,8 @@ type Supplements struct {
 	TemplateManager    *templatemanager.TemplateManager
 	MarkdownRenderer   goldmark.Markdown
 	Meta               config.MetaConfig
+	PhotoStorage       config.PhotoStorageConfig
+	StaticStorage      config.PhotoTypeConfig
 }
 
 type Router struct {
@@ -156,7 +158,7 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 
 	supplements.MarkdownRenderer = goldmark.New(
 		goldmark.WithExtensions(
-			glightbox.NewGLightboxExtension(),
+			glightbox.NewGLightboxExtension(cfg.PhotoStorage),
 			tailwind.NewTailwindExtension(),
 		),
 		goldmark.WithParserOptions(
@@ -217,6 +219,8 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 	}
 
 	supplements.Meta = cfg.Meta
+	supplements.PhotoStorage = cfg.PhotoStorage
+	supplements.StaticStorage = cfg.StaticStorage
 
 	enablePrintRoutes := false
 	if cfg.LogLevel <= slog.LevelDebug {
@@ -229,7 +233,7 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 	})
 
 	app.Use(cors.New(cors.Config{
-		AllowOrigins: "https://f003.backblazeb2.com",
+		AllowOrigins: strings.Join(cfg.AllowOrigins, ","),
 		AllowMethods: "GET,POST,OPTIONS",
 		AllowHeaders: "Origin, Content-Type, Accept",
 	}))
@@ -299,11 +303,13 @@ func (r *Router) InitRoutes() (err error) {
 				}
 
 				defaultMap := fiber.Map{
-					"L":                 r.supplements.Localization[lang],
-					"Lang":              lang,
-					"Path":              trimmedPath,
-					"QueryString":       queryString,
-					"CanonicalEndpoint": r.canonicalEndpoint,
+					"L":                    r.supplements.Localization[lang],
+					"Lang":                 lang,
+					"Path":                 trimmedPath,
+					"QueryString":          queryString,
+					"CanonicalEndpoint":    r.canonicalEndpoint,
+					"StaticStorageBaseUrl": r.supplements.StaticStorage.BaseUrl,
+					"ThumbnailBaseUrl":     r.supplements.PhotoStorage.Thumbnail320p.BaseUrl,
 				}
 
 				statusCode, err := currentRoute.Render(c, r.supplements, lang, defaultMap)
@@ -423,10 +429,12 @@ func (r *Router) generalPage(c *fiber.Ctx, route Route, lang string) error {
 	}
 
 	valueMap := fiber.Map{
-		"L":                 r.supplements.Localization[lang],
-		"Lang":              lang,
-		"QueryString":       queryString,
-		"CanonicalEndpoint": r.canonicalEndpoint,
+		"L":                    r.supplements.Localization[lang],
+		"Lang":                 lang,
+		"QueryString":          queryString,
+		"CanonicalEndpoint":    r.canonicalEndpoint,
+		"StaticStorageBaseUrl": r.supplements.StaticStorage.BaseUrl,
+		"ThumbnailBaseUrl":     r.supplements.PhotoStorage.Thumbnail320p.BaseUrl,
 	}
 
 	var err error
@@ -503,11 +511,13 @@ func (r *Router) generalPageSegment(c *fiber.Ctx, part string) error {
 
 	var statusCode int
 	defaultMap := fiber.Map{
-		"L":                 r.supplements.Localization[lang],
-		"Lang":              lang,
-		"Path":              strings.Trim(path, "/"),
-		"QueryString":       queryString,
-		"CanonicalEndpoint": r.canonicalEndpoint,
+		"L":                    r.supplements.Localization[lang],
+		"Lang":                 lang,
+		"Path":                 strings.Trim(path, "/"),
+		"QueryString":          queryString,
+		"CanonicalEndpoint":    r.canonicalEndpoint,
+		"StaticStorageBaseUrl": r.supplements.StaticStorage.BaseUrl,
+		"ThumbnailBaseUrl":     r.supplements.PhotoStorage.Thumbnail320p.BaseUrl,
 	}
 
 	switch part {