Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 85 |
1 files changed, 22 insertions, 63 deletions
@@ -82,7 +82,7 @@ func main() { {Name: "blog-page", Files: []string{"views/layouts/general-page.html", "views/pages/blog-page.html"}}, {Name: "blog-catalogue", Files: []string{"views/layouts/general-page.html", "views/pages/blog-catalogue.html"}}, {Name: "index", Files: []string{"views/index.html"}}, - {Name: "catalogue-blog-cards", Files: []string{"views/partials/catalogue-blog-cards.html", "views/partials/catalogue-blog-card-tags.html"}}, + {Name: "catalogue-blog-cards", Files: []string{"views/partials/catalogue-blog-cards.html"}}, }) if err != nil { slog.Error("fail to initialize template manager", slog.String("error", err.Error())) @@ -121,7 +121,7 @@ func main() { querySort := c.Query("sort") if querySort == "" { - querySort = "publicationDateDesc" + querySort = "titleAsc" } encodedQuery := c.Request().URI().QueryString() @@ -146,26 +146,19 @@ func main() { pages = []*b2.BlogPage{} } - tagsMap := make(map[string]int) + tagsSet := make(map[string]struct{}) for _, page := range pages { - slog.Debug("enlist page for catalogue", slog.Any("page", page), slog.String("endpoint", "/"+lang+"/blog")) + slog.Debug("enlist page for catalogue", slog.Any("page", page), slog.String("endpoint", "/")) for _, tag := range page.Metadata.Tags { - tagsMap[tag]++ + tagsSet[tag] = struct{}{} } } - type Tag struct { - Name string `json:"Name" yaml:"name"` - Count int `json:"Count" yaml:"count"` + tagsArray := make([]string, 0, len(tagsSet)) + for tag := range tagsSet { + tagsArray = append(tagsArray, tag) } - - tagsArray := make([]Tag, 0, len(tagsMap)) - for tag, count := range tagsMap { - tagsArray = append(tagsArray, Tag{tag, count}) - } - slices.SortFunc(tagsArray, func(a Tag, b Tag) int { - return strings.Compare(a.Name, b.Name) - }) + slices.Sort(tagsArray) content, err := tm.Render("blog-catalogue", fiber.Map{ "QuerySort": querySort, @@ -227,49 +220,15 @@ func main() { return c.Type("html").Send(content) }) - app.Get("/api/v1/tz", func(c *fiber.Ctx) error { - timestampString := c.Query("timestamp") - tz := c.Query("tz") - - loc, err := time.LoadLocation(tz) - if err != nil { - loc = time.UTC - slog.Warn("unable to parse a client timezone, defaulting to UTC", slog.String("error", err.Error()), slog.String("tz", tz)) - } - - var format string - var timestamp time.Time - for _, format = range []string{"2006-01-02 15:04:05 -07:00", time.RFC3339} { - if timestamp, err = time.Parse(format, timestampString); err == nil { - break - } - } - - c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) - - if err != nil { - return c.Status(fiber.StatusBadRequest).SendString("invalid timestamp format") - } - - return c.Status(fiber.StatusOK).SendString(timestamp.In(loc).Format(format)) - }) - app.Get("/api/v1/blog-search", func(c *fiber.Ctx) error { sort := c.Query("sort") lang := c.Query("lang") - tz := c.Query("tz") if !slices.Contains(availableLanguages, lang) { c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language", lang)) } - loc, err := time.LoadLocation(tz) - if err != nil { - loc = time.UTC - slog.Warn("unable to parse a client timezone, defaulting to UTC", slog.String("error", err.Error()), slog.String("tz", tz)) - } - pages, err := b2Client.Scan(lang + "/") if err != nil { c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) @@ -291,42 +250,42 @@ func main() { tags = append(tags, string(match[1])) } - pageMeta := make([]fiber.Map, 0, len(pages)) + pageMeta := make([]map[string]string, 0, len(pages)) for _, page := range pages { for _, tag := range page.Metadata.Tags { if len(tags) == 0 || slices.Contains(tags, tag) { - pageMeta = append(pageMeta, fiber.Map{ + pageMeta = append(pageMeta, map[string]string{ "Link": page.Link, "ArticleLink": "/" + lang + "/blog/" + page.FileName, "Title": page.Metadata.Title, - "PublishedTime": page.Metadata.PublishedTime.In(loc).Format("2006-01-02 15:04:05 -07:00"), + "PublishedTime": page.Metadata.PublishedTime.Format("2006-01-02 15:04:05 -0700"), "ActionDate": page.Metadata.ActionDate, "ShortDescription": page.Metadata.ShortDescription, "Thumbnail": page.Metadata.Thumbnail, - "Tags": page.Metadata.Tags, + "Tags": strings.Join(page.Metadata.Tags, ", "), }) break } } } - slices.SortFunc(pageMeta, func(a, b fiber.Map) int { + slices.SortFunc(pageMeta, func(a, b map[string]string) int { switch sort { case "titleAsc": - return strings.Compare(a["Title"].(string), b["Title"].(string)) + return strings.Compare(a["Title"], b["Title"]) case "titleDesc": - return strings.Compare(b["Title"].(string), a["Title"].(string)) + return strings.Compare(b["Title"], a["Title"]) case "actionDateAsc": - return strings.Compare(a["ActionDate"].(string), b["ActionDate"].(string)) + return strings.Compare(a["ActionDate"], b["ActionDate"]) case "actionDateDesc": - return strings.Compare(b["ActionDate"].(string), a["ActionDate"].(string)) + return strings.Compare(b["ActionDate"], a["ActionDate"]) case "publicationDateAsc": - publishedTimeA, _ := time.Parse("2006-01-02 15:04:05 -07:00", a["PublishedTime"].(string)) - publishedTimeB, _ := time.Parse("2006-01-02 15:04:05 -07:00", b["PublishedTime"].(string)) + publishedTimeA, _ := time.Parse(time.RFC3339, a["PublishedTime"]) + publishedTimeB, _ := time.Parse(time.RFC3339, b["PublishedTime"]) return publishedTimeA.Compare(publishedTimeB) case "publicationDateDesc": - publishedTimeA, _ := time.Parse("2006-01-02 15:04:05 -07:00", a["PublishedTime"].(string)) - publishedTimeB, _ := time.Parse("2006-01-02 15:04:05 -07:00", b["PublishedTime"].(string)) + publishedTimeA, _ := time.Parse(time.RFC3339, a["PublishedTime"]) + publishedTimeB, _ := time.Parse(time.RFC3339, b["PublishedTime"]) return publishedTimeB.Compare(publishedTimeA) } return 0 |