VnPower/PixivFE
1
0
Fork 0
mirror of https://codeberg.org/VnPower/PixivFE synced 2024-12-06 19:16:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

all type check, no panic

Browse Source
This commit is contained in:
iacore
2024-08-27 14:49:19 +00:00
parent 68deed7e00
commit 12be0ce3fc
4 changed files with 71 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/dev/framework-migration.md
+6 -2
View File
@@ -21,6 +21,10 @@ Idea: we create a compat layer of {w, r} that has the same API as *fiber.Ctx.
## Tips
To access `/:abc`, use `r.PathValue("abc")`.
- To access `/:abc`, use `r.PathValue("abc")`.
- Want to associate arbitrary value with a request? Use `r.Context.Value()`.
- Don't use `r.Response`. It's `nil`.
Want to associate arbitrary value with a request? Use `r.Context.Value()`.
## todo
- correct redirect status codes. currently i put in whatever.
main.go
+59 -45
View File
@@ -165,7 +165,11 @@ func main() {
router := defineRoutes()
main_handler := func(w http.ResponseWriter, r *http.Request) {
main_handler := func(w_ http.ResponseWriter, r *http.Request) {
w := &ResponseWriterInterceptStatus{
statusCode: 0,
ResponseWriter: w_,
}
// set user context
r = r.WithContext(context.WithValue(r.Context(), UserContextKey, &UserContext{}))
@@ -191,7 +195,7 @@ func main() {
ip := r.RemoteAddr
method := r.Method
path := r.URL.Path
status := r.Response.Status
status := w.statusCode
err := GetUserContext(r).err
log.Printf("%v +%v %v %v %v %v %v", time, latency, ip, method, path, status, err)
@@ -265,55 +269,55 @@ func defineRoutes() *mux.Router {
router.Handle("/js/", http.FileServer(http.Dir("./assets/js")))
// Routes
router.Get("/").Handler(CatchError(routes.IndexPage))
// server.Get("/about", routes.AboutPage)
// server.Get("/newest", routes.NewestPage)
// server.Get("/discovery", routes.DiscoveryPage)
// server.Get("/discovery/novel", routes.NovelDiscoveryPage)
// server.Get("/ranking", routes.RankingPage)
// server.Get("/rankingCalendar", routes.RankingCalendarPage)
// server.Post("/rankingCalendar", routes.RankingCalendarPicker)
// server.Get("/users/:id.atom.xml", routes.UserAtomFeed)
// server.Get("/users/:id/:category.atom.xml", routes.UserAtomFeed)
// server.Get("/users/:id/:category?", routes.UserPage)
// server.Get("/artworks/:id/", routes.ArtworkPage).Name("artworks")
// server.Get("/artworks-multi/:ids/", routes.ArtworkMultiPage)
// server.Get("/novel/:id/", routes.NovelPage)
// server.Get("/pixivision", routes.PixivisionHomePage)
// server.Get("/pixivision/a/:id", routes.PixivisionArticlePage)
router.HandleFunc("/", CatchError(routes.IndexPage)).Methods("GET")
router.HandleFunc("/about", CatchError(routes.AboutPage)).Methods("GET")
router.HandleFunc("/newest", CatchError(routes.NewestPage)).Methods("GET")
router.HandleFunc("/discovery", CatchError(routes.DiscoveryPage)).Methods("GET")
router.HandleFunc("/discovery/novel", CatchError(routes.NovelDiscoveryPage)).Methods("GET")
router.HandleFunc("/ranking", CatchError(routes.RankingPage)).Methods("GET")
router.HandleFunc("/rankingCalendar", CatchError(routes.RankingCalendarPage)).Methods("GET")
router.HandleFunc("/rankingCalendar", CatchError(routes.RankingCalendarPicker)).Methods("POST")
router.HandleFunc("/users/:id.atom.xml", CatchError(routes.UserAtomFeed)).Methods("GET")
router.HandleFunc("/users/:id/:category.atom.xml", CatchError(routes.UserAtomFeed)).Methods("GET")
router.HandleFunc("/users/:id/:category?", CatchError(routes.UserPage)).Methods("GET")
router.HandleFunc("/artworks/:id/", CatchError(routes.ArtworkPage)).Methods("GET")
router.HandleFunc("/artworks-multi/:ids/", CatchError(routes.ArtworkMultiPage)).Methods("GET")
router.HandleFunc("/novel/:id/", CatchError(routes.NovelPage)).Methods("GET")
router.HandleFunc("/pixivision", CatchError(routes.PixivisionHomePage)).Methods("GET")
router.HandleFunc("/pixivision/a/:id", CatchError(routes.PixivisionArticlePage)).Methods("GET")
// // Settings group
// settings := server.Group("/settings")
// settings.Get("/", routes.SettingsPage)
// settings.Post("/:type/:noredirect?", routes.SettingsPost)
// Settings group
settings := router.NewRoute().Path("/settings").Subrouter()
settings.HandleFunc("/", CatchError(routes.SettingsPage)).Methods("GET")
settings.HandleFunc("/:type/:noredirect?", CatchError(routes.SettingsPost)).Methods("POST")
// // Personal group
// self := server.Group("/self")
// self.Get("/", routes.LoginUserPage)
// self.Get("/followingWorks", routes.FollowingWorksPage)
// self.Get("/bookmarks", routes.LoginBookmarkPage)
// self.Get("/addBookmark/:id", routes.AddBookmarkRoute)
// self.Get("/deleteBookmark/:id", routes.DeleteBookmarkRoute)
// self.Get("/like/:id", routes.LikeRoute)
// Personal group
self := router.NewRoute().Path("/self").Subrouter()
self.HandleFunc("/", CatchError(routes.LoginUserPage)).Methods("GET")
self.HandleFunc("/followingWorks", CatchError(routes.FollowingWorksPage)).Methods("GET")
self.HandleFunc("/bookmarks", CatchError(routes.LoginBookmarkPage)).Methods("GET")
self.HandleFunc("/addBookmark/:id", CatchError(routes.AddBookmarkRoute)).Methods("GET")
self.HandleFunc("/deleteBookmark/:id", CatchError(routes.DeleteBookmarkRoute)).Methods("GET")
self.HandleFunc("/like/:id", CatchError(routes.LikeRoute)).Methods("GET")
// // Oembed group
// server.Get("/oembed", routes.Oembed)
// Oembed group
router.HandleFunc("/oembed", CatchError(routes.Oembed)).Methods("GET")
// server.Get("/tags/:name", routes.TagPage)
// server.Post("/tags/:name", routes.TagPage)
// server.Get("/tags", routes.TagPage)
// server.Post("/tags", routes.AdvancedTagPost)
router.HandleFunc("/tags/:name", CatchError(routes.TagPage)).Methods("GET")
router.HandleFunc("/tags/:name", CatchError(routes.TagPage)).Methods("POST")
router.HandleFunc("/tags", CatchError(routes.TagPage)).Methods("GET")
router.HandleFunc("/tags", CatchError(routes.AdvancedTagPost)).Methods("POST")
// // Legacy illust URL
// server.Get("/member_illust.php", func(r *http.Request) error {
// return r.Redirect("/artworks/" + r.Query("illust_id"))
// })
// Legacy illust URL
router.HandleFunc("/member_illust.php", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/artworks/"+routes.CompatRequest{Request: r}.Query("illust_id"), http.StatusFound)
}).Methods("GET")
// // Proxy routes
// proxy := server.Group("/proxy")
// proxy.Get("/i.pximg.net/*", routes.IPximgProxy)
// proxy.Get("/s.pximg.net/*", routes.SPximgProxy)
// proxy.Get("/ugoira.com/*", routes.UgoiraProxy)
// Proxy routes
proxy := router.NewRoute().Path("/proxy").Subrouter()
proxy.HandleFunc("/i.pximg.net/*", CatchError(routes.IPximgProxy)).Methods("GET")
proxy.HandleFunc("/s.pximg.net/*", CatchError(routes.SPximgProxy)).Methods("GET")
proxy.HandleFunc("/ugoira.com/*", CatchError(routes.UgoiraProxy)).Methods("GET")
return router
}
@@ -323,3 +327,13 @@ func CatchError(handler func(w http.ResponseWriter, r routes.CompatRequest) erro
GetUserContext(r).err = handler(w, routes.CompatRequest{Request: r})
}
}
type ResponseWriterInterceptStatus struct {
statusCode int
http.ResponseWriter
}
func (w *ResponseWriterInterceptStatus) WriteHeader(code int) {
w.statusCode = code
w.ResponseWriter.WriteHeader(code)
}
routes/personal.go
+6 -2
View File
@@ -10,8 +10,12 @@ import (
)
func PromptUserToLoginPage(w http.ResponseWriter, r CompatRequest) error {
r.Response.StatusCode = http.StatusUnauthorized
return Render(w, r, Data_unauthorized{})
err := Render(w, r, Data_unauthorized{})
if err != nil {
return err
}
w.WriteHeader(http.StatusUnauthorized)
return nil
}
func LoginUserPage(w http.ResponseWriter, r CompatRequest) error {
routes/settings.go
-3
View File
@@ -14,9 +14,6 @@ import (
"codeberg.org/vnpower/pixivfe/v2/session"
)
// todo: allow clear proxy
// todo: allow clear all settings
func setToken(w http.ResponseWriter, r CompatRequest) error {
token := r.FormValue("token")
if token != "" {