From baeb7531e1fd44168e76e18c57bf972f4aa884df Mon Sep 17 00:00:00 2001
From: iacore <iacore@noreply.codeberg.org>
Date: Tue, 27 Aug 2024 14:11:03 +0000
Subject: [PATCH] fix more

---
 core/requests.go          | 18 +++++++++---------
 routes/personal.go        |  2 +-
 routes/rankingCalendar.go |  2 +-
 routes/settings.go        |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/requests.go b/core/requests.go
index 42e9a3d..80f024e 100644
--- a/core/requests.go
+++ b/core/requests.go
@@ -64,15 +64,15 @@ func WebAPIRequest(context context.Context, URL, token string) HttpResponse {
 }
 
 func webAPIRequest(context context.Context, URL, token string) HttpResponse {
-	req, err := http.NewRequestWithContext(r.Context(), "GET", URL, nil)
- if err != nil {
-   return HttpResponse{
- 			Ok:         false,
- 			StatusCode: 0,
- 			Body:       "",
- 			Message:    fmt.Sprintf("Failed to create a request to %s\n.", URL),
- 		}
- }
+	req, err := http.NewRequestWithContext(context, "GET", URL, nil)
+	if err != nil {
+		return HttpResponse{
+			Ok:         false,
+			StatusCode: 0,
+			Body:       "",
+			Message:    fmt.Sprintf("Failed to create a request to %s\n.", URL),
+		}
+	}
 
 	req.Header.Add("User-Agent", config.GlobalServerConfig.UserAgent)
 	req.Header.Add("Accept-Language", config.GlobalServerConfig.AcceptLanguage)
diff --git a/routes/personal.go b/routes/personal.go
index 6eaaa31..3b22c8f 100644
--- a/routes/personal.go
+++ b/routes/personal.go
@@ -10,7 +10,7 @@ import (
 )
 
 func PromptUserToLoginPage(w http.ResponseWriter, r CompatRequest) error {
-	r.Status(http.StatusUnauthorized)
+	r.Response.StatusCode = http.StatusUnauthorized
 	return Render(w, r, Data_unauthorized{})
 }
 
diff --git a/routes/rankingCalendar.go b/routes/rankingCalendar.go
index d27e460..449e6af 100644
--- a/routes/rankingCalendar.go
+++ b/routes/rankingCalendar.go
@@ -64,7 +64,7 @@ func RankingCalendarPage(w http.ResponseWriter, r CompatRequest) error {
 			return err
 		}
 	} else {
-		now := r.Context().Time()
+		now := time.Now()
 		year = now.Year()
 		month = int(now.Month())
 	}
diff --git a/routes/settings.go b/routes/settings.go
index 9325a7b..a472f7f 100644
--- a/routes/settings.go
+++ b/routes/settings.go
@@ -113,8 +113,8 @@ func setArtworkPreview(w http.ResponseWriter, r CompatRequest) error {
 }
 
 func setLogout(w http.ResponseWriter, r CompatRequest) error {
-	session.ClearCookie(r.Request, session.Cookie_Token)
-	session.ClearCookie(r.Request, session.Cookie_CSRF)
+	session.ClearCookie(w, session.Cookie_Token)
+	session.ClearCookie(w, session.Cookie_CSRF)
 	return nil
 }