v0.16.0 (#40)v0.16.0

* [feat: all color themes now have light & dark variations depending on
preference](https://github.com/SayaAndy/saya-today-web/commit/44b72cbc80fb89788470bda75eeb9c0bb3dee2f5)
* [feat: use self-hosted pmtiles for
map](https://github.com/SayaAndy/saya-today-web/commit/fa52ed00e8ef3303f14d7c953f1591eb19042635)
* [feat: subheader for blog pages with medley-related
ones](https://github.com/SayaAndy/saya-today-web/commit/c07da125bc5b0bb65f58c4edce912874e46f6ed8)
* feat: color all leaflet elements depending on color theme & scheme
* [feat: combined map
widget](https://github.com/SayaAndy/saya-today-web/pull/40/commits/6418da32d978a8b70d38f1911a154e4dcc33202e)
* feat: migrate static & photos to gcore cdn
* [refactor: rewrite localization for dynamic set and
get](https://github.com/SayaAndy/saya-today-web/commit/e9353a66bf51486f702eaa0f591dea54c9bd4cd1)
* [feat: highlight the blog page visited earlier in blog
catalogue](https://github.com/SayaAndy/saya-today-web/commit/ed476a1f0d3f970f977626688ac316f8b251d3a0)
* fix: inline shadow now sticks to scrolling
* [feat: take all metadata from centralized
index.json](https://github.com/SayaAndy/saya-today-web/commit/1c441f5eab9a2a24fe5309178ce010f32adac1c7)
* [fix: font in like button on smartphone
screens](https://github.com/SayaAndy/saya-today-web/commit/551295ecacebbb94019def022f70397f74c44775)
* [feat: use "page // medley" format for
title](https://github.com/SayaAndy/saya-today-web/pull/40/commits/0dbb85f25c69b5e7929bb832e7967a709a76ff5c)
* feat: multitone backgrounds implementation
* feat: change font to m-plus for short description
* fix: theme wheel position on different dpi screens in global map
* feat: integrate package minor updates
* refactor: convert color vars into oklch
* [refactor: rm scanning by listing for s3
client](https://github.com/SayaAndy/saya-today-web/commit/1a95e20cc4e050244a76a3ea4cccc5ab30ff5a91)
* fix: on errors with blog client init write correct type

1 files changed, 23 insertions, 36 deletions

diff --git a/internal/router/router.go b/internal/router/router.go
index 7f3511a..c8b5686 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -23,7 +23,6 @@ import (
 	"github.com/SayaAndy/saya-today-web/internal/mailer"
 	"github.com/SayaAndy/saya-today-web/internal/tailwind"
 	"github.com/SayaAndy/saya-today-web/internal/templatemanager"
-	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/dgraph-io/ristretto/v2"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/compress"
@@ -95,7 +94,6 @@ type Route interface {
 type Supplements struct {
 	DB                 *sql.DB
 	BlogClient         blog.Client
-	Localization       map[string]*locale.LocaleConfig
 	AvailableLanguages []config.AvailableLanguageConfig
 	ClientCache        *ClientCache
 	PageCache          *ristretto.Cache[string, []byte]
@@ -106,7 +104,7 @@ type Supplements struct {
 	MarkdownRenderer   goldmark.Markdown
 	Meta               config.MetaConfig
 	PhotoStorage       config.PhotoStorageConfig
-	StaticStorage      config.PhotoTypeConfig
+	StaticStorage      config.StaticStorageConfig
 }
 
 type Router struct {
@@ -149,16 +147,7 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 
 	supplements.BlogClient, err = blog.NewClientMap[cfg.BlogPages.Storage.Type](&cfg.BlogPages.Storage)
 	if err != nil {
-		return nil, fmt.Errorf("fail to initialize b2 client: %w", err)
-	}
-
-	supplements.Localization = make(map[string]*locale.LocaleConfig, len(cfg.AvailableLanguages))
-	for _, lang := range cfg.AvailableLanguages {
-		localeCfg, err := locale.InitConfig(cfg.LocalePath + lang.LocFile)
-		if err != nil {
-			return nil, fmt.Errorf("fail to initialize a locale: %w", err)
-		}
-		supplements.Localization[lang.Name] = localeCfg
+		return nil, fmt.Errorf("fail to initialize blog client: type %s: %w", cfg.BlogPages.Storage.Type, err)
 	}
 
 	supplements.MarkdownRenderer = goldmark.New(
@@ -200,7 +189,7 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 	}
 
 	supplements.Mailer, err = mailer.NewMailer(supplements.DB, cfg.Mail.ClientHost, cfg.Mail.MailHost,
-		cfg.Mail.PublicName, cfg.Mail.MailAddress, cfg.Mail.Username, cfg.Mail.Password, []byte(cfg.Mail.Salt), supplements.Localization)
+		cfg.Mail.PublicName, cfg.Mail.MailAddress, cfg.Mail.Username, cfg.Mail.Password, []byte(cfg.Mail.Salt))
 	if err != nil {
 		return nil, fmt.Errorf("fail to initialize mailer: %w", err)
 	}
@@ -314,13 +303,12 @@ func (r *Router) InitRoutes() (err error) {
 				}
 
 				defaultMap := fiber.Map{
-					"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,
+					"Lang":              lang,
+					"Path":              trimmedPath,
+					"QueryString":       queryString,
+					"CanonicalEndpoint": r.canonicalEndpoint,
+					"StaticStorage":     r.supplements.StaticStorage,
+					"PhotoStorage":      r.supplements.PhotoStorage,
 				}
 
 				statusCode, err := currentRoute.Render(c, r.supplements, lang, defaultMap)
@@ -467,13 +455,12 @@ func (r *Router) generalPage(c *fiber.Ctx, route Route, lang string) error {
 	}
 
 	valueMap := fiber.Map{
-		"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,
+		"Lang":              lang,
+		"Path":              trimmedPath,
+		"QueryString":       queryString,
+		"CanonicalEndpoint": r.canonicalEndpoint,
+		"StaticStorage":     r.supplements.StaticStorage,
+		"PhotoStorage":      r.supplements.PhotoStorage,
 	}
 
 	var err error
@@ -576,11 +563,12 @@ func (r *Router) generalPageSegment(c *fiber.Ctx, part string) error {
 
 	cacheKey := ""
 	trimmedPath := strings.Trim(path, "/")
+	requestQuery := string(c.Request().URI().QueryString())
 	switch route.ToCache() {
 	case ByUrlOnly:
 		cacheKey = fmt.Sprintf("%s.%s.%s", method, part, trimmedPath)
 	case ByUrlAndQuery:
-		cacheKey = fmt.Sprintf("%s.%s.%s.%s", method, part, trimmedPath, queryString)
+		cacheKey = fmt.Sprintf("%s.%s.%s.%s.%s", method, part, trimmedPath, queryString, requestQuery)
 	}
 
 	if route.ToCache() != Disabled {
@@ -592,13 +580,12 @@ 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,
-		"StaticStorageBaseUrl": r.supplements.StaticStorage.BaseUrl,
-		"ThumbnailBaseUrl":     r.supplements.PhotoStorage.Thumbnail320p.BaseUrl,
+		"Lang":              lang,
+		"Path":              strings.Trim(path, "/"),
+		"QueryString":       queryString,
+		"CanonicalEndpoint": r.canonicalEndpoint,
+		"StaticStorage":     r.supplements.StaticStorage,
+		"PhotoStorage":      r.supplements.PhotoStorage,
 	}
 
 	switch part {