Merge pull request 'various minor changes' (#53) from iacore/pixivfe:various-1 into v2

Reviewed-on: https://codeberg.org/VnPower/PixivFE/pulls/53

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()

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!")
@@ -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)
 

views/css/style.css

@@ -22,7 +22,7 @@ a {
 /* Scrollbars */
 * {
   scrollbar-width: thin;
-  scrollbar-color: #118bee auto;
+  /* scrollbar-color: #118bee auto; */
 }
 
 *::-webkit-scrollbar {

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 {

views/layout.jet.html

@@ -7,7 +7,7 @@
     <meta charset="UTF-8" />
     <meta name="description" content="View this page on PixivFE." />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'" />
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self'" />
     <meta name="referrer" content="no-referrer, same-origin" />
     <link href="/css/style.css" rel="stylesheet" />
 

views/pages/components/small-tn-normal.jet.html

@@ -1,6 +0,0 @@
-{{ range . }} {{ if .ID }}
-<div class="artwork-thumbnail-small artwork-thumbnail">
-  {{ include "thumbnail-dt" . }} {{ include "thumbnail-tt" . }} {{ include
-  "thumbnail-at" . }}
-</div>
-{{ end }} {{ end }}