feat: support s3 for blog pages

refactor: make blog client an interface
feat: claude.md

8 files changed, 27 insertions, 27 deletions

diff --git a/internal/router/handlers/api-v1-blog-search.go b/internal/router/handlers/api-v1-blog-search.go
index 1e8a480..c9a91ad 100644
--- a/internal/router/handlers/api-v1-blog-search.go
+++ b/internal/router/handlers/api-v1-blog-search.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/SayaAndy/saya-today-web/internal/b2"
+	"github.com/SayaAndy/saya-today-web/internal/blog"
 	"github.com/SayaAndy/saya-today-web/internal/router"
 	"github.com/gofiber/fiber/v2"
 )
@@ -56,11 +56,11 @@ func (r *BlogSearchHandler) Render(c *fiber.Ctx, supplements *router.Supplements
 
 	cacheKey := "blog-search." + lang + ".pages-list"
 
-	var pages []*b2.BlogPage
+	var pages []*blog.Page
 	if pagesBytes, ok := supplements.PageCache.Get(cacheKey); pagesBytes != nil || ok {
 		json.Unmarshal(pagesBytes, &pages)
 	} else {
-		pages, err = supplements.B2Client.Scan(lang + "/")
+		pages, err = supplements.BlogClient.Scan(lang + "/")
 		if err != nil {
 			return fiber.StatusInternalServerError, fmt.Errorf("failed to scan pages for '%s' lang: %w", lang, err)
 		}
diff --git a/internal/router/handlers/api-v1-like-get.go b/internal/router/handlers/api-v1-like-get.go
index e9c176e..0eaf5f6 100644
--- a/internal/router/handlers/api-v1-like-get.go
+++ b/internal/router/handlers/api-v1-like-get.go
@@ -48,7 +48,7 @@ func (r *GetLikeHandler) Render(c *fiber.Ctx, supplements *router.Supplements, l
 
 	page := pathParts[2]
 	pageLink := lang + "/" + page + ".md"
-	if pages, _ := supplements.B2Client.Scan(pageLink); len(pages) == 0 {
+	if pages, _ := supplements.BlogClient.Scan(pageLink); len(pages) == 0 {
 		return fiber.StatusNotFound, fmt.Errorf("server did not find '%s' article", pageLink)
 	}
 
diff --git a/internal/router/handlers/api-v1-like-put.go b/internal/router/handlers/api-v1-like-put.go
index ea4ef4b..434f15a 100644
--- a/internal/router/handlers/api-v1-like-put.go
+++ b/internal/router/handlers/api-v1-like-put.go
@@ -49,7 +49,7 @@ func (r *PutLikeHandler) Render(c *fiber.Ctx, supplements *router.Supplements, l
 
 	page := pathParts[2]
 	pageLink := lang + "/" + page + ".md"
-	if pages, _ := supplements.B2Client.Scan(pageLink); len(pages) == 0 {
+	if pages, _ := supplements.BlogClient.Scan(pageLink); len(pages) == 0 {
 		return fiber.StatusNotFound, fmt.Errorf("server did not find '%s' article", pageLink)
 	}
 
diff --git a/internal/router/handlers/lang-blog-title.go b/internal/router/handlers/lang-blog-title.go
index 5bfc6e7..f1be0a5 100644
--- a/internal/router/handlers/lang-blog-title.go
+++ b/internal/router/handlers/lang-blog-title.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/SayaAndy/saya-today-web/internal/b2"
+	"github.com/SayaAndy/saya-today-web/internal/blog"
 	"github.com/SayaAndy/saya-today-web/internal/frontmatter"
 	"github.com/SayaAndy/saya-today-web/internal/router"
 	"github.com/gofiber/fiber/v2"
@@ -49,7 +49,7 @@ func (r *BlogPageHandler) ToValidateLang() router.LangSetting {
 func (r *BlogPageHandler) SitemapInfo(supplements *router.Supplements) []router.SitemapInfo {
 	sitemapInfo := []router.SitemapInfo{}
 
-	pages, err := supplements.B2Client.Scan("")
+	pages, err := supplements.BlogClient.Scan("")
 	if err != nil {
 		return sitemapInfo
 	}
@@ -66,7 +66,7 @@ func (r *BlogPageHandler) SitemapInfo(supplements *router.Supplements) []router.
 }
 
 func (r *BlogPageHandler) AddMeta(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (meta []router.MetaField, err error) {
-	metadata, _, err := supplements.B2Client.ReadFrontmatter(lang + "/" + c.Params("title") + ".md")
+	metadata, _, err := supplements.BlogClient.ReadFrontmatter(lang + "/" + c.Params("title") + ".md")
 	if err != nil {
 		return nil, fmt.Errorf("failed to read frontmatter of the desired blog post: %w", err)
 	}
@@ -82,7 +82,7 @@ func (r *BlogPageHandler) AddMeta(c *fiber.Ctx, supplements *router.Supplements,
 }
 
 func (r *BlogPageHandler) AddLinkedData(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (ld map[string]any, err error) {
-	metadata, _, err := supplements.B2Client.ReadFrontmatter(lang + "/" + c.Params("title") + ".md")
+	metadata, _, err := supplements.BlogClient.ReadFrontmatter(lang + "/" + c.Params("title") + ".md")
 	if err != nil {
 		return nil, fmt.Errorf("failed to read frontmatter of the desired blog post: %w", err)
 	}
@@ -103,7 +103,7 @@ func (r *BlogPageHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplemen
 		return fiber.StatusBadRequest, fmt.Errorf("failed to get path from referer: %w", err)
 	}
 
-	metadata, parsedMarkdown, err := readBlogPost(supplements.MarkdownRenderer, supplements.B2Client, lang+"/"+pathParts[2])
+	metadata, parsedMarkdown, err := readBlogPost(supplements.MarkdownRenderer, supplements.BlogClient, lang+"/"+pathParts[2])
 	if err != nil {
 		return fiber.StatusNotFound, fmt.Errorf("failed to find '%s' post: %w", pathParts[2], err)
 	}
@@ -138,7 +138,7 @@ func (r *BlogPageHandler) RenderHeader(c *fiber.Ctx, supplements *router.Supplem
 		return fiber.StatusBadRequest, fmt.Errorf("failed to get path from referer: %w", err)
 	}
 
-	metadata, _, err := supplements.B2Client.ReadFrontmatter(lang + "/" + pathParts[2] + ".md")
+	metadata, _, err := supplements.BlogClient.ReadFrontmatter(lang + "/" + pathParts[2] + ".md")
 	if err != nil {
 		return fiber.StatusNotFound, fmt.Errorf("could not read '%s' for metadata: %w", path, err)
 	}
@@ -148,8 +148,8 @@ func (r *BlogPageHandler) RenderHeader(c *fiber.Ctx, supplements *router.Supplem
 	return fiber.StatusOK, nil
 }
 
-func readBlogPost(md goldmark.Markdown, b2Client *b2.B2Client, sourceName string) (metadata *frontmatter.Metadata, html string, err error) {
-	metadata, markdown, err := b2Client.ReadFrontmatter(sourceName + ".md")
+func readBlogPost(md goldmark.Markdown, blogClient blog.Client, sourceName string) (metadata *frontmatter.Metadata, html string, err error) {
+	metadata, markdown, err := blogClient.ReadFrontmatter(sourceName + ".md")
 	if err != nil {
 		return nil, "", fmt.Errorf("failed to read a frontmatter file: %w", err)
 	}
diff --git a/internal/router/handlers/lang-blog.go b/internal/router/handlers/lang-blog.go
index 709d3dc..79ec9f3 100644
--- a/internal/router/handlers/lang-blog.go
+++ b/internal/router/handlers/lang-blog.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/SayaAndy/saya-today-web/internal/b2"
+	"github.com/SayaAndy/saya-today-web/internal/blog"
 	"github.com/SayaAndy/saya-today-web/internal/router"
 	"github.com/gofiber/fiber/v2"
 )
@@ -79,7 +79,7 @@ func (r *CatalogueHandler) RenderBody(c *fiber.Ctx, supplements *router.Suppleme
 		queryTags = append(queryTags, string(match[1]))
 	}
 
-	tagsArray, err := getTags(supplements.B2Client, lang)
+	tagsArray, err := getTags(supplements.BlogClient, lang)
 	if err != nil {
 		return fiber.StatusInternalServerError, fmt.Errorf("failed to get the available tags")
 	}
@@ -102,8 +102,8 @@ type Tag struct {
 	Count int    `json:"Count" yaml:"count"`
 }
 
-func getTags(b2Client *b2.B2Client, lang string) (tags []Tag, err error) {
-	pages, err := b2Client.Scan(lang + "/")
+func getTags(blogClient blog.Client, lang string) (tags []Tag, err error) {
+	pages, err := blogClient.Scan(lang + "/")
 	if err != nil {
 		slog.Warn("failed to scan pages via b2", slog.String("error", err.Error()))
 		return nil, fmt.Errorf("failed to scan pages via b2: %w", err)
diff --git a/internal/router/handlers/lang-map.go b/internal/router/handlers/lang-map.go
index 551b485..d452bc7 100644
--- a/internal/router/handlers/lang-map.go
+++ b/internal/router/handlers/lang-map.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/SayaAndy/saya-today-web/internal/b2"
+	"github.com/SayaAndy/saya-today-web/internal/blog"
 	"github.com/SayaAndy/saya-today-web/internal/router"
 	"github.com/gofiber/fiber/v2"
 )
@@ -49,8 +49,8 @@ func (r *MapHandler) SitemapInfo(supplements *router.Supplements) []router.Sitem
 }
 
 func (r *MapHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
-	pages, err := supplements.B2Client.Scan(lang + "/")
-	slices.SortFunc(pages, func(a *b2.BlogPage, b *b2.BlogPage) int {
+	pages, err := supplements.BlogClient.Scan(lang + "/")
+	slices.SortFunc(pages, func(a *blog.Page, b *blog.Page) int {
 		return a.Metadata.PublishedTime.Compare(b.Metadata.PublishedTime)
 	})
 	status := fiber.StatusOK
@@ -60,7 +60,7 @@ func (r *MapHandler) Render(c *fiber.Ctx, supplements *router.Supplements, lang
 			slog.String("lang", lang),
 		)
 		status = fiber.StatusPartialContent
-		pages = []*b2.BlogPage{}
+		pages = []*blog.Page{}
 	}
 
 	type MapMarker struct {
diff --git a/internal/router/handlers/lang-user.go b/internal/router/handlers/lang-user.go
index eae1685..0dda529 100644
--- a/internal/router/handlers/lang-user.go
+++ b/internal/router/handlers/lang-user.go
@@ -55,7 +55,7 @@ func (r *UserHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplements,
 		slog.Error("get info from mailer about a client", slog.String("error", err.Error()))
 	}
 
-	tagsArray, err := getTags(supplements.B2Client, lang)
+	tagsArray, err := getTags(supplements.BlogClient, lang)
 	if err != nil {
 		return fiber.ErrInternalServerError.Code, fmt.Errorf("failed to get the available tags")
 	}
diff --git a/internal/router/router.go b/internal/router/router.go
index 3242759..e8fb47a 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/SayaAndy/saya-today-web/config"
-	"github.com/SayaAndy/saya-today-web/internal/b2"
+	"github.com/SayaAndy/saya-today-web/internal/blog"
 	"github.com/SayaAndy/saya-today-web/internal/blogtrigger"
 	"github.com/SayaAndy/saya-today-web/internal/factgiver"
 	"github.com/SayaAndy/saya-today-web/internal/glightbox"
@@ -90,7 +90,7 @@ type Route interface {
 
 type Supplements struct {
 	DB                 *sql.DB
-	B2Client           *b2.B2Client
+	BlogClient         blog.Client
 	Localization       map[string]*locale.LocaleConfig
 	AvailableLanguages []config.AvailableLanguageConfig
 	ClientCache        *ClientCache
@@ -140,7 +140,7 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 	}
 	slog.Debug("successfully applied migrations")
 
-	supplements.B2Client, err = b2.NewB2Client(&cfg.BlogPages.Storage.Config)
+	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)
 	}
@@ -198,8 +198,8 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 		return nil, fmt.Errorf("fail to initialize mailer: %w", err)
 	}
 
-	supplements.BlogTrigger, err = blogtrigger.NewBlogTriggerScheduler(supplements.B2Client, cfg.AvailableLanguages, cfg.Mail.Trigger.OnNewPost,
-		func(bp []*b2.BlogPage) error {
+	supplements.BlogTrigger, err = blogtrigger.NewBlogTriggerScheduler(supplements.BlogClient, cfg.AvailableLanguages, cfg.Mail.Trigger.OnNewPost,
+		func(bp []*blog.Page) error {
 			for _, post := range bp {
 				if err := supplements.Mailer.NewPost(post); err != nil {
 					return err