diff --git a/main.go b/main.go index e881db7..149f16e 100644 --- a/main.go +++ b/main.go @@ -171,7 +171,7 @@ func main() { start_time := time.Now() - setGlobalHeaders(w) + setGlobalHeaders(w, r) router.ServeHTTP(w, r) @@ -240,7 +240,7 @@ func main() { http.Serve(l, http.HandlerFunc(main_handler)) } -func setGlobalHeaders(w http.ResponseWriter) { +func setGlobalHeaders(w http.ResponseWriter, r *http.Request) { header := w.Header() header.Add("X-Frame-Options", "DENY") // use this if need iframe: `X-Frame-Options: SAMEORIGIN` diff --git a/routes/settings.go b/routes/settings.go index ba96357..6dd6777 100644 --- a/routes/settings.go +++ b/routes/settings.go @@ -72,7 +72,7 @@ func setImageServer(w http.ResponseWriter, r CompatRequest) error { if token != "" { session.SetCookie(w, session.Cookie_ImageProxy, token) } else { - session.ClearCookie(r, session.Cookie_ImageProxy) + session.ClearCookie(w, session.Cookie_ImageProxy) } return nil } @@ -169,25 +169,25 @@ func SettingsPost(w http.ResponseWriter, r CompatRequest) error { switch t { case "imageServer": - err = setImageServer(r) + err = setImageServer(w, r) case "token": - err = setToken(r) + err = setToken(w, r) case "logout": - err = setLogout(r) + err = setLogout(w, r) case "reset-all": - err = resetAll(r) + err = resetAll(w, r) case "novelFontType": - err = setNovelFontType(r) + err = setNovelFontType(w, r) case "thumbnailToNewTab": - err = setThumbnailToNewTab(r) + err = setThumbnailToNewTab(w, r) case "novelViewMode": - err = setNovelViewMode(r) + err = setNovelViewMode(w, r) case "artworkPreview": - err = setArtworkPreview(r) + err = setArtworkPreview(w, r) case "set-cookie": - err = setCookie(r) + err = setCookie(w, r) case "raw": - err = setRawCookie(r) + err = setRawCookie(w, r) default: err = errors.New("No such setting is available.") } diff --git a/routes/user.go b/routes/user.go index 92a681a..c702197 100644 --- a/routes/user.go +++ b/routes/user.go @@ -16,7 +16,7 @@ type userPageData struct { page int } -func fetchData(r *fiber.Ctx, getTags bool) (userPageData, error) { +func fetchData(r CompatRequest, getTags bool) (userPageData, error) { id := r.Params("id") if _, err := strconv.Atoi(id); err != nil { return userPageData{}, err