From 44154b84cf8f30eff7cfcdfed40989d783fbec28 Mon Sep 17 00:00:00 2001 From: iacore Date: Thu, 8 Feb 2024 21:02:46 +0000 Subject: [PATCH 1/5] prepend routes with / --- main.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/main.go b/main.go index a676cea..c89eb73 100644 --- a/main.go +++ b/main.go @@ -131,29 +131,29 @@ func main() { }) server.Static("/favicon.ico", "./views/assets/favicon.ico") - server.Static("css/", "./views/css") - server.Static("assets/", "./views/assets") + server.Static("/css/", "./views/css") + server.Static("/assets/", "./views/assets") server.Static("/robots.txt", "./views/assets/robots.txt") // Routes server.Get("/", pages.IndexPage) - server.Get("about", pages.AboutPage) - server.Get("newest", pages.NewestPage) - server.Get("discovery", pages.DiscoveryPage) - server.Get("ranking", pages.RankingPage) - server.Get("rankingCalendar", pages.RankingCalendarPage) - server.Post("rankingCalendar", pages.RankingCalendarPicker) - server.Get("users/:id/:category?", pages.UserPage) - server.Get("artworks/:id/", pages.ArtworkPage).Name("artworks") + server.Get("/about", pages.AboutPage) + server.Get("/newest", pages.NewestPage) + server.Get("/discovery", pages.DiscoveryPage) + server.Get("/ranking", pages.RankingPage) + server.Get("/rankingCalendar", pages.RankingCalendarPage) + server.Post("/rankingCalendar", pages.RankingCalendarPicker) + server.Get("/users/:id/:category?", pages.UserPage) + server.Get("/artworks/:id/", pages.ArtworkPage).Name("artworks") // Settings group - settings := server.Group("settings") + settings := server.Group("/settings") settings.Get("/", pages.SettingsPage) settings.Post("/:type", pages.SettingsPost) // Personal group - self := server.Group("self") + self := server.Group("/self") self.Get("/", pages.LoginUserPage) self.Get("/followingWorks", pages.FollowingWorksPage) self.Get("/bookmarks", pages.LoginBookmarkPage) @@ -161,8 +161,8 @@ func main() { self.Post("/deleteBookmark/:id", pages.DeleteBookmarkRoute) self.Post("/like/:id", pages.LikeRoute) - server.Get("tags/:name", pages.TagPage) - server.Post("tags", + server.Get("/tags/:name", pages.TagPage) + server.Post("/tags", func(c *fiber.Ctx) error { name := c.FormValue("name") @@ -170,12 +170,12 @@ func main() { }) // Legacy illust URL - server.Get("member_illust.php", func(c *fiber.Ctx) error { - return c.Redirect("artworks/" + c.Query("illust_id")) + server.Get("/member_illust.php", func(c *fiber.Ctx) error { + return c.Redirect("/artworks/" + c.Query("illust_id")) }) // Proxy routes - proxy := server.Group("proxy") + proxy := server.Group("/proxy") proxy.Get("/s.pximg.net/*", pages.SPximgProxy) proxy.Get("/ugoira.com/*", pages.UgoiraProxy) From cc932c0cdafe21eba9cb67d87d8593ed6d834891 Mon Sep 17 00:00:00 2001 From: iacore Date: Thu, 8 Feb 2024 21:03:22 +0000 Subject: [PATCH 2/5] delete (seemingly) unused file --- views/pages/components/small-tn-normal.jet.html | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 views/pages/components/small-tn-normal.jet.html diff --git a/views/pages/components/small-tn-normal.jet.html b/views/pages/components/small-tn-normal.jet.html deleted file mode 100644 index a62b917..0000000 --- a/views/pages/components/small-tn-normal.jet.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ range . }} {{ if .ID }} -
- {{ include "thumbnail-dt" . }} {{ include "thumbnail-tt" . }} {{ include - "thumbnail-at" . }} -
-{{ end }} {{ end }} From 7b541cdfc8ffd3447f427f1020c3629fc4b3c5e5 Mon Sep 17 00:00:00 2001 From: iacore Date: Thu, 8 Feb 2024 21:28:15 +0000 Subject: [PATCH 3/5] comment invalid scss --- views/css/style.css | 2 +- views/css/style.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/views/css/style.css b/views/css/style.css index f46ba0f..6240509 100644 --- a/views/css/style.css +++ b/views/css/style.css @@ -22,7 +22,7 @@ a { /* Scrollbars */ * { scrollbar-width: thin; - scrollbar-color: #118bee auto; + /* scrollbar-color: #118bee auto; */ } *::-webkit-scrollbar { diff --git a/views/css/style.scss b/views/css/style.scss index bc99c29..79c0fb8 100644 --- a/views/css/style.scss +++ b/views/css/style.scss @@ -41,7 +41,8 @@ a { /* Scrollbars */ * { scrollbar-width: thin; - scrollbar-color: $link auto; + // invalid line + // scrollbar-color: $link auto; } *::-webkit-scrollbar { From 4ccb3d60bd9018b315c28692db518b155c0c2d26 Mon Sep 17 00:00:00 2001 From: iacore Date: Thu, 8 Feb 2024 21:51:54 +0000 Subject: [PATCH 4/5] Make request limit configurable --- core/config/config.go | 7 ++++--- main.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/config/config.go b/core/config/config.go index c264820..1d915d9 100644 --- a/core/config/config.go +++ b/core/config/config.go @@ -80,10 +80,11 @@ func (s *ServerConfig) InitializeConfig() error { s.SetAcceptLanguage(acceptLanguage) requestLimit, hasRequestLimit := os.LookupEnv("PIXIVFE_REQUESTLIMIT") - if !hasRequestLimit { - requestLimit = "100" + if hasRequestLimit { + s.SetRequestLimit(requestLimit) + } else { + s.RequestLimit = 15 } - s.SetRequestLimit(requestLimit) s.setStartingTime() s.setVersion() diff --git a/main.go b/main.go index c89eb73..f75cc35 100644 --- a/main.go +++ b/main.go @@ -105,7 +105,7 @@ func main() { return strings.Contains(path, "/assets") || strings.Contains(path, "/s.pximg.net") || strings.Contains(path, "/css") }, Expiration: 30 * time.Second, - Max: 15, + Max: config.GlobalServerConfig.RequestLimit, LimiterMiddleware: limiter.SlidingWindow{}, LimitReached: func(c *fiber.Ctx) error { log.Println("Hit!") From b8c42b56a74ae8b9cea416546ee6a92fd6398a29 Mon Sep 17 00:00:00 2001 From: iacore Date: Thu, 8 Feb 2024 22:05:41 +0000 Subject: [PATCH 5/5] revert CSP --- views/layout.jet.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/layout.jet.html b/views/layout.jet.html index df3ff97..155c460 100644 --- a/views/layout.jet.html +++ b/views/layout.jet.html @@ -7,7 +7,7 @@ - +