Revert "default cookies"

This reverts commit 01d46aa60b.

config/config.go

@@ -68,20 +68,6 @@ type ServerConfig struct {
 	// Development options
 	InDevelopment        bool   `env:"PIXIVFE_DEV"`
 	ResponseSaveLocation string `env:"PIXIVFE_RESPONSE_SAVE_LOCATION,overwrite"`
-
-	DefaultCookies       DefaultCookies
-	EnableDefaultCookies bool `env:"PIXIVFE_ENABLE_DEFAULT_COOKIES,overwrite"`
-}
-
-type DefaultCookies struct {
-	ImageProxy        string
-	NovelFontType     string
-	NovelViewMode     string
-	ThumbnailToNewTab string
-	ArtworkPreview    string
-	HideArtR18        string
-	HideArtR18G       string
-	HideArtAI         string
 }
 
 // parseRevision extracts RevisionDate, RevisionHash, and IsDirty status from the Revision string
@@ -158,21 +144,6 @@ func (s *ServerConfig) LoadConfig() error {
 
 	s.ResponseSaveLocation = "/tmp/pixivfe/responses"
 
-	// Set default cookie values
-	s.DefaultCookies = DefaultCookies{
-		// ImageProxy:        s.ProxyServer_staging,
-		NovelFontType:     "gothic",
-		NovelViewMode:     "vertical",
-		ThumbnailToNewTab: "false",
-		ArtworkPreview:    "true",
-		HideArtR18:        "false",
-		HideArtR18G:       "false",
-		HideArtAI:         "false",
-	}
-
-	// Set default value for EnableDefaultCookies
-	s.EnableDefaultCookies = true
-
 	// load config from from env vars
 	if err := envconfig.Process(context.Background(), s); err != nil {
 		return err
@@ -233,9 +204,6 @@ func (s *ServerConfig) LoadConfig() error {
 		log.Printf("Response save location: %s\n", s.ResponseSaveLocation)
 	}
 
-	// Log the EnableDefaultCookies setting
-	log.Printf("Enable default cookies: %v\n", s.EnableDefaultCookies)
-
 	return nil
 }
 

server/middleware/default_cookies.go

@@ -1,32 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-
-	"codeberg.org/vnpower/pixivfe/v2/config"
-	"codeberg.org/vnpower/pixivfe/v2/server/session"
-)
-
-func SetDefaultCookies(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Check if it's a first visit
-		_, err := r.Cookie("pixivfe-visited")
-		if err == http.ErrNoCookie {
-			// It's a first visit, set default cookies
-			defaultCookies := config.GlobalConfig.DefaultCookies
-			session.SetCookie(w, session.Cookie_ImageProxy, defaultCookies.ImageProxy)
-			session.SetCookie(w, session.Cookie_NovelFontType, defaultCookies.NovelFontType)
-			session.SetCookie(w, session.Cookie_NovelViewMode, defaultCookies.NovelViewMode)
-			session.SetCookie(w, session.Cookie_ThumbnailToNewTab, defaultCookies.ThumbnailToNewTab)
-			session.SetCookie(w, session.Cookie_ArtworkPreview, defaultCookies.ArtworkPreview)
-			session.SetCookie(w, session.Cookie_HideArtR18, defaultCookies.HideArtR18)
-			session.SetCookie(w, session.Cookie_HideArtR18G, defaultCookies.HideArtR18G)
-			session.SetCookie(w, session.Cookie_HideArtAI, defaultCookies.HideArtAI)
-
-			// Set the visited cookie
-			session.SetCookie(w, "pixivfe-visited", "true")
-		}
-
-		next.ServeHTTP(w, r)
-	})
-}

server/middleware/router.go

@@ -30,9 +30,6 @@ func serveFile(filename string) http.HandlerFunc {
 func DefineRoutes() *mux.Router {
 	router := mux.NewRouter()
 
-	// Apply the SetDefaultCookies middleware to all routes
-	router.Use(SetDefaultCookies)
-
 	// Tutorial: Adding new routes
 	// 1. Use router.HandleFunc to define the path and handler
 	// 2. Wrap the handler function, defined in package routes, with CatchError for error handling