From d1dd363c5a999f907b687fb897c19a80eaa95a02 Mon Sep 17 00:00:00 2001 From: iacore Date: Wed, 20 Mar 2024 14:40:22 +0000 Subject: [PATCH] WIP --- main.go | 2 +- pages/user.go | 23 +++++++++++++++++++---- views/pages/user.atom.jet.html | 22 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 views/pages/user.atom.jet.html diff --git a/main.go b/main.go index 179a831..47f3d4f 100644 --- a/main.go +++ b/main.go @@ -212,7 +212,7 @@ func main() { server.Get("/rankingCalendar", pages.RankingCalendarPage) server.Post("/rankingCalendar", pages.RankingCalendarPicker) server.Get("/users/:id.atom.xml", pages.UserAtomFeed) - server.Get("/users/:id/:category.atom.xml", pages.UserAtomFeed) + server.Get("/users/:id/:category?.atom.xml", pages.UserAtomFeed) server.Get("/users/:id/:category?", pages.UserPage) server.Get("/artworks/:id/", pages.ArtworkPage).Name("artworks") server.Get("/artworks/:id/embed", pages.ArtworkEmbedPage) diff --git a/pages/user.go b/pages/user.go index b5667b1..a4f160d 100644 --- a/pages/user.go +++ b/pages/user.go @@ -1,9 +1,9 @@ package pages import ( - "errors" "math" "strconv" + "time" core "codeberg.org/vnpower/pixivfe/v2/core/webapi" "github.com/gofiber/fiber/v2" @@ -74,7 +74,22 @@ func UserAtomFeed(c *fiber.Ctx) error { if err != nil { return err } - - _ = data - return errors.New("unimplemented") + + err = c.Render("pages/user.atom", fiber.Map{ + "URL": string(c.Request().RequestURI()), + "Title": data.user.Name, + "User": data.user, + "Category": data.category, + "Updated": time.Now().Format(time.RFC3339), + "PageLimit": data.pageLimit, + "Page": data.pageCurrent, + // "MetaImage": data.user.BackgroundImage, + }, "") + if err != nil { + return err + } + + c.Context().SetContentType("application/atom+xml") + + return nil } diff --git a/views/pages/user.atom.jet.html b/views/pages/user.atom.jet.html new file mode 100644 index 0000000..08c4938 --- /dev/null +++ b/views/pages/user.atom.jet.html @@ -0,0 +1,22 @@ +{* *} + + {{ Title }} + + + {{ Updated }} + + {{ User.Name }} + + {{ BaseURL }}{{ URL }} + + TK: art URL + + TK + TK: ISO8601 time + +
+ TK: xhtml content here +
+
+
+
\ No newline at end of file