From 9c59f786ab7b4dd545f4e45e7866df2fcb7a9c48 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Tue, 12 Aug 2025 10:46:05 +0700 Subject: fix: process trailing slash in url when going up refactor: put :lang: as first layer of href --- internal/b2/client.go | 8 ++++++-- main.go | 14 ++++++++------ views/index.html | 2 +- views/layouts/general-page.html | 4 ++-- views/partials/catalogue-blog-cards.html | 8 ++++---- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/internal/b2/client.go b/internal/b2/client.go index 1a97e5f..5322b84 100644 --- a/internal/b2/client.go +++ b/internal/b2/client.go @@ -33,6 +33,7 @@ func NewB2Client(cfg *config.B2Config) (*B2Client, error) { type BlogPage struct { Link string + FileName string Metadata *frontmatter.Metadata } @@ -69,10 +70,13 @@ func (c *B2Client) Scan(prefix string) ([]*BlogPage, error) { return nil, fmt.Errorf("failed to parse published time metadata field: %w", err) } - linkParts := strings.Split(obj.Name(), ".") + linkParts := strings.Split(obj.Name(), "/") + nameParts := strings.Split(linkParts[len(linkParts)-1], ".") + fileName := strings.Join(nameParts[:len(linkParts)-1], ".") filePaths = append(filePaths, &BlogPage{ - Link: strings.Join(linkParts[:len(linkParts)-1], "."), + Link: obj.Name(), + FileName: fileName, Metadata: &frontmatter.Metadata{ Title: attrs.Info["title"], ShortDescription: attrs.Info["short-description"], diff --git a/main.go b/main.go index 6a36f59..7b8bfd3 100644 --- a/main.go +++ b/main.go @@ -93,7 +93,8 @@ func main() { app.Use(redirect.New(redirect.Config{ Rules: map[string]string{ - "/blog": "/", + "/ru": "/", + "/en": "/", }, StatusCode: 301, })) @@ -111,7 +112,7 @@ func main() { return c.Type("html").Send(content) }) - app.Get("/blog/:lang", func(c *fiber.Ctx) error { + app.Get("/:lang/blog", func(c *fiber.Ctx) error { lang := c.Params("lang") if !slices.Contains(availableLanguages, lang) { c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) @@ -169,7 +170,7 @@ func main() { "Title": localization[lang].BlogSearch.Header, }) if err != nil { - slog.Warn("failed to generate page", slog.String("page", "/blog/"+lang), slog.String("error", err.Error())) + slog.Warn("failed to generate page", slog.String("page", "/"+lang+"/blog"), slog.String("error", err.Error())) c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate page") } @@ -177,7 +178,7 @@ func main() { return c.Type("html").Status(status).Send(content) }) - app.Get("/blog/:lang/:title", func(c *fiber.Ctx) error { + app.Get("/:lang/blog/:title", func(c *fiber.Ctx) error { lang := c.Params("lang") if !slices.Contains(availableLanguages, lang) { c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) @@ -211,7 +212,7 @@ func main() { "Lang": lang, }) if err != nil { - slog.Warn("failed to generate page", slog.String("page", "/blog/"+lang+c.Params("title")), slog.String("error", err.Error())) + slog.Warn("failed to generate page", slog.String("page", "/"+lang+"/blog/"+c.Params("title")), slog.String("error", err.Error())) c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate page") } @@ -255,6 +256,7 @@ func main() { if len(tags) == 0 || slices.Contains(tags, tag) { pageMeta = append(pageMeta, map[string]string{ "Link": page.Link, + "ArticleLink": "/" + lang + "/blog/" + page.FileName, "Title": page.Metadata.Title, "PublishedTime": page.Metadata.PublishedTime.Format("2006-01-02 15:04:05 -0700"), "ActionDate": page.Metadata.ActionDate, @@ -294,7 +296,7 @@ func main() { "L": localization[lang], }) if err != nil { - slog.Warn("failed to generate div", slog.String("page", "/blog/"+lang), slog.String("error", err.Error())) + slog.Warn("failed to generate div", slog.String("page", "/"+lang+"/blog"), slog.String("error", err.Error())) c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div") } diff --git a/views/index.html b/views/index.html index 1c57bd1..2b8c937 100644 --- a/views/index.html +++ b/views/index.html @@ -106,7 +106,7 @@

saya.today

{{- range .AvailableLanguages }} - {{ .Alt }} + {{ .Alt }} {{- end }}

Choose your language

diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index d33aa76..d5146f8 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -39,7 +39,7 @@
- +
@@ -50,7 +50,7 @@
- +

//

{{ .Title }}

{{- if .PublishedDate }} diff --git a/views/partials/catalogue-blog-cards.html b/views/partials/catalogue-blog-cards.html index 7cb48f0..36a6184 100644 --- a/views/partials/catalogue-blog-cards.html +++ b/views/partials/catalogue-blog-cards.html @@ -1,12 +1,12 @@ {{- range .BlogPages }}
- +
- {{ .Title }} - // - {{ .ActionDate }} + {{ .Title }} + // + {{ .ActionDate }}

{{ .PublishedTime }}

{{ .ShortDescription }}

-- cgit v1.3.1+13