9 files changed, 22 insertions, 19 deletions
diff --git a/internal/router/basic-handler.go b/internal/router/basic-handler.go
index 68d305c..8398e2b 100644
--- a/internal/router/basic-handler.go
+++ b/internal/router/basic-handler.go
@@ -42,7 +42,7 @@ func (r *BasicHandler) ContentType() string {
 	return fiber.MIMETextHTMLCharsetUTF8
 }
 
-func (r *BasicHandler) RateLimiter() *fiber.Handler {
+func (r *BasicHandler) RateLimiter() fiber.Handler {
 	return nil
 }
 
diff --git a/internal/router/handlers/api-v1-blog-search.go b/internal/router/handlers/api-v1-blog-search.go
index b59f09a..322227f 100644
--- a/internal/router/handlers/api-v1-blog-search.go
+++ b/internal/router/handlers/api-v1-blog-search.go
@@ -44,8 +44,8 @@ func (r *BlogSearchHandler) ToValidateLang() router.LangSetting {
 	return router.InForm
 }
 
-func (r *BlogSearchHandler) RateLimiter() *fiber.Handler {
-	return &router.RateLimiterLoose
+func (r *BlogSearchHandler) RateLimiter() fiber.Handler {
+	return router.RateLimiterLoose
 }
 
 func (r *BlogSearchHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
diff --git a/internal/router/handlers/api-v1-email-send-verification-code.go b/internal/router/handlers/api-v1-email-send-verification-code.go
index ea8df4d..190f357 100644
--- a/internal/router/handlers/api-v1-email-send-verification-code.go
+++ b/internal/router/handlers/api-v1-email-send-verification-code.go
@@ -39,8 +39,8 @@ func (r *SendVerificationCodeHandler) ToValidateLang() router.LangSetting {
 	return router.InReferer
 }
 
-func (r *SendVerificationCodeHandler) RateLimiter() *fiber.Handler {
-	return &router.RateLimiterStrict
+func (r *SendVerificationCodeHandler) RateLimiter() fiber.Handler {
+	return router.RateLimiterStrict
 }
 
 func (r *SendVerificationCodeHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
diff --git a/internal/router/handlers/api-v1-email-verify.go b/internal/router/handlers/api-v1-email-verify.go
index 65ad6d9..7649774 100644
--- a/internal/router/handlers/api-v1-email-verify.go
+++ b/internal/router/handlers/api-v1-email-verify.go
@@ -37,8 +37,8 @@ func (r *VerifyCodeHandler) ToValidateLang() router.LangSetting {
 	return router.InReferer
 }
 
-func (r *VerifyCodeHandler) RateLimiter() *fiber.Handler {
-	return &router.RateLimiterStrict
+func (r *VerifyCodeHandler) RateLimiter() fiber.Handler {
+	return router.RateLimiterStrict
 }
 
 func (r *VerifyCodeHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
diff --git a/internal/router/handlers/api-v1-like-put.go b/internal/router/handlers/api-v1-like-put.go
index 8305d2b..c14f76e 100644
--- a/internal/router/handlers/api-v1-like-put.go
+++ b/internal/router/handlers/api-v1-like-put.go
@@ -37,8 +37,8 @@ func (r *PutLikeHandler) ToValidateLang() router.LangSetting {
 	return router.InReferer
 }
 
-func (r *PutLikeHandler) RateLimiter() *fiber.Handler {
-	return &router.RateLimiterMedium
+func (r *PutLikeHandler) RateLimiter() fiber.Handler {
+	return router.RateLimiterMedium
 }
 
 func (r *PutLikeHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
diff --git a/internal/router/handlers/api-v1-subs-put.go b/internal/router/handlers/api-v1-subs-put.go
index 12dc5cf..6d9fd1f 100644
--- a/internal/router/handlers/api-v1-subs-put.go
+++ b/internal/router/handlers/api-v1-subs-put.go
@@ -35,8 +35,8 @@ func (r *PutSubsHandler) ToValidateLang() router.LangSetting {
 	return router.InReferer
 }
 
-func (r *PutSubsHandler) RateLimiter() *fiber.Handler {
-	return &router.RateLimiterMedium
+func (r *PutSubsHandler) RateLimiter() fiber.Handler {
+	return router.RateLimiterMedium
 }
 
 func (r *PutSubsHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
diff --git a/internal/router/handlers/lang-blog-title.go b/internal/router/handlers/lang-blog-title.go
index 5a1155d..76dc335 100644
--- a/internal/router/handlers/lang-blog-title.go
+++ b/internal/router/handlers/lang-blog-title.go
@@ -156,7 +156,13 @@ func (r *BlogPageHandler) RenderHeader(c *fiber.Ctx, supplements *router.Supplem
 		return fiber.StatusNotFound, fmt.Errorf("could not read '%s' for metadata: %w", path, err)
 	}
 
+	pageTitle := metadata.Title
+	if metadata.Medley != "" {
+		pageTitle += " // " + l10n.T.GetPath(lang, "Medleys", metadata.Medley).(string)
+	}
+
 	templateMap["Title"] = metadata.Title
+	templateMap["PageTitle"] = pageTitle
 
 	return fiber.StatusOK, nil
 }
diff --git a/internal/router/handlers/root.go b/internal/router/handlers/root.go
index 6a011e4..4fc4e31 100644
--- a/internal/router/handlers/root.go
+++ b/internal/router/handlers/root.go
@@ -47,11 +47,8 @@ func (r *RootHandler) AddMeta(c *fiber.Ctx, supplements *router.Supplements, lan
 		{Property: "og:url", Content: fmt.Sprint(templateMap["CanonicalEndpoint"]) + "/"},
 		{Property: "og:type", Content: "website"},
 	}
-	if supplements.Meta.GoogleSiteVerification != "" {
-		meta = append(meta, router.MetaField{Name: "google-site-verification", Content: supplements.Meta.GoogleSiteVerification})
-	}
-	if supplements.Meta.YandexVerification != "" {
-		meta = append(meta, router.MetaField{Name: "yandex-verification", Content: supplements.Meta.YandexVerification})
+	for _, field := range supplements.Meta {
+		meta = append(meta, router.MetaField{Name: field.Name, Content: field.Value})
 	}
 	return meta, nil
 }
diff --git a/internal/router/router.go b/internal/router/router.go
index c8b5686..2869851 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -80,7 +80,7 @@ type Route interface {
 	TemplatesToInject() []string
 	SitemapInfo(supplements *Supplements) []SitemapInfo
 	ContentType() string
-	RateLimiter() *fiber.Handler
+	RateLimiter() fiber.Handler
 	Render(c *fiber.Ctx, supplements *Supplements, lang string, templateMap fiber.Map) (statusCode int, err error)
 	AddMeta(c *fiber.Ctx, supplements *Supplements, lang string, templateMap fiber.Map) (meta []MetaField, err error)
 	AddLinkedData(c *fiber.Ctx, supplements *Supplements, lang string, templateMap fiber.Map) (ld map[string]any, err error)
@@ -102,7 +102,7 @@ type Supplements struct {
 	BlogTrigger        *blogtrigger.BlogTriggerScheduler
 	TemplateManager    *templatemanager.TemplateManager
 	MarkdownRenderer   goldmark.Markdown
-	Meta               config.MetaConfig
+	Meta               []config.MetaConfig
 	PhotoStorage       config.PhotoStorageConfig
 	StaticStorage      config.StaticStorageConfig
 }
@@ -262,7 +262,7 @@ func (r *Router) InitRoutes() (err error) {
 		}
 
 		if rateLimiter := route.RateLimiter(); rateLimiter != nil {
-			r.app.Use(match, *rateLimiter)
+			r.app.Use(match, rateLimiter)
 		}
 
 		if route.IsTemplated() {