feat: highlight the blog page visited earlier in blog catalogue

2 files changed, 5 insertions, 5 deletions

diff --git a/internal/router/handlers/lang-blog.go b/internal/router/handlers/lang-blog.go
index 79ec9f3..9f7947b 100644
--- a/internal/router/handlers/lang-blog.go
+++ b/internal/router/handlers/lang-blog.go
@@ -65,10 +65,8 @@ func (r *CatalogueHandler) AddMeta(c *fiber.Ctx, supplements *router.Supplements
 }
 
 func (r *CatalogueHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
-	querySort := c.Query("sort")
-	if querySort == "" {
-		querySort = "publicationDateDesc"
-	}
+	querySort := c.Query("sort", "publicationDateDesc")
+	previousBlogPage := c.Query("codename")
 
 	encodedQuery := c.Request().URI().QueryString()
 	decodedQuery, _ := url.QueryUnescape(string(encodedQuery))
@@ -88,6 +86,7 @@ func (r *CatalogueHandler) RenderBody(c *fiber.Ctx, supplements *router.Suppleme
 	templateMap["QuerySort"] = querySort
 	templateMap["QueryTags"] = strings.Join(queryTags, ",")
 	templateMap["Title"] = supplements.Localization[lang].BlogSearch.Header
+	templateMap["PreviousBlogPage"] = previousBlogPage
 
 	return fiber.StatusOK, nil
 }
diff --git a/internal/router/router.go b/internal/router/router.go
index 7f3511a..a1208e0 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -576,11 +576,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 {