From e2efcd550c9dd0e2520d6ed76718b87e45500f50 Mon Sep 17 00:00:00 2001 From: Up Date: Tue, 14 May 2024 23:17:14 +0200 Subject: [PATCH 01/24] fix faulty sql query --- db/account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/account.go b/db/account.go index e000122..a54b7bc 100644 --- a/db/account.go +++ b/db/account.go @@ -212,7 +212,7 @@ func UpdateTrainerIds(trainerId, secretId int, uuid []byte) error { func IsActiveSession(uuid []byte, clientSessionId string) (bool, error) { var storedId string - err := handle.QueryRow("SELECT clientSessionId FROM activeClientSessions WHERE sessions.uuid = ?", uuid).Scan(&storedId) + err := handle.QueryRow("SELECT clientSessionId FROM activeClientSessions WHERE uuid = ?", uuid).Scan(&storedId) if err != nil { if errors.Is(err, sql.ErrNoRows) { return false, nil From 174b962f193af0fb3ef09c5222687bc4dc1df61e Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 00:00:38 +0200 Subject: [PATCH 02/24] update verify endpoint --- api/common.go | 2 +- api/endpoints.go | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/common.go b/api/common.go index ec87644..bdd5aab 100644 --- a/api/common.go +++ b/api/common.go @@ -56,7 +56,7 @@ func Init(mux *http.ServeMux) error { // new session mux.HandleFunc("POST /savedata/updateall", handleUpdateAll) - mux.HandleFunc("POST /savedata/verify", handleSessionVerify) + mux.HandleFunc("POST /savedata/system/verify", handleSystemVerify) mux.HandleFunc("GET /savedata/system", handleGetSystemData) mux.HandleFunc("GET /savedata/session", handleGetSessionData) diff --git a/api/endpoints.go b/api/endpoints.go index 62a958d..205e012 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -627,7 +627,7 @@ func handleUpdateAll(w http.ResponseWriter, r *http.Request) { return } } else { - if err := db.UpdateTrainerIds(trainerId, secretId, uuid); err != nil { + if err = db.UpdateTrainerIds(trainerId, secretId, uuid); err != nil { httpError(w, r, err, http.StatusInternalServerError) return } @@ -646,24 +646,23 @@ func handleUpdateAll(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } -type SessionVerifyResponse struct { - Valid bool `json:"valid"` - SessionData *defs.SessionSaveData `json:"sessionData"` +type SystemVerifyResponse struct { + Valid bool `json:"valid"` + SystemData *defs.SystemSaveData `json:"systemData"` } -type SessionVerifyRequest struct { +type SystemVerifyRequest struct { ClientSessionId string `json:"clientSessionId"` - Slot int `json:"slot"` } -func handleSessionVerify(w http.ResponseWriter, r *http.Request) { +func handleSystemVerify(w http.ResponseWriter, r *http.Request) { uuid, err := uuidFromRequest(r) if err != nil { httpError(w, r, err, http.StatusBadRequest) return } - var input SessionVerifyRequest + var input SystemVerifyRequest err = json.NewDecoder(r.Body).Decode(&input) if err != nil { httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest) @@ -677,7 +676,7 @@ func handleSessionVerify(w http.ResponseWriter, r *http.Request) { return } - response := SessionVerifyResponse{ + response := SystemVerifyResponse{ Valid: active, } @@ -689,14 +688,14 @@ func handleSessionVerify(w http.ResponseWriter, r *http.Request) { return } - var storedSaveData defs.SessionSaveData - storedSaveData, err = db.ReadSessionSaveData(uuid, input.Slot) + var storedSaveData defs.SystemSaveData + storedSaveData, err = db.ReadSystemSaveData(uuid) if err != nil { httpError(w, r, fmt.Errorf("failed to read session save data: %s", err), http.StatusInternalServerError) return } - response.SessionData = &storedSaveData + response.SystemData = &storedSaveData } jsonResponse(w, r, response) @@ -733,6 +732,7 @@ func handleGetSystemData(w http.ResponseWriter, r *http.Request) { return } + //TODO apply vouchers jsonResponse(w, r, save) } From e7cff35d69346c043b0372fff7fa747097ad8e38 Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 00:50:50 +0200 Subject: [PATCH 03/24] delete vouchers when claiming them --- api/savedata/get.go | 4 ++++ api/savedata/update.go | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/api/savedata/get.go b/api/savedata/get.go index 1e5feeb..3a1cecb 100644 --- a/api/savedata/get.go +++ b/api/savedata/get.go @@ -57,6 +57,10 @@ func Get(uuid []byte, datatype, slot int) (any, error) { if err != nil { return nil, fmt.Errorf("failed to update system save data: %s", err) } + err = db.DeleteClaimedAccountCompensations(uuid) + if err != nil { + return nil, fmt.Errorf("failed to delete claimed compensations: %s", err) + } err = db.UpdateAccountStats(uuid, system.GameStats, system.VoucherCounts) if err != nil { diff --git a/api/savedata/update.go b/api/savedata/update.go index 6876b57..58eee72 100644 --- a/api/savedata/update.go +++ b/api/savedata/update.go @@ -47,11 +47,6 @@ func Update(uuid []byte, slot int, save any) error { return fmt.Errorf("failed to update account stats: %s", err) } - err = db.DeleteClaimedAccountCompensations(uuid) - if err != nil { - return fmt.Errorf("failed to delete claimed compensations: %s", err) - } - return db.StoreSystemSaveData(uuid, save) case defs.SessionSaveData: // Session From 2aab022ce3766f55fa4d9491eaa4f2a75da31597 Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 04:07:47 +0200 Subject: [PATCH 04/24] properly use client session ID --- api/endpoints.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/api/endpoints.go b/api/endpoints.go index 205e012..4d80a42 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -585,14 +585,6 @@ func handleUpdateAll(w http.ResponseWriter, r *http.Request) { return } - var clientSessionId string - if r.URL.Query().Has("clientSessionId") { - clientSessionId = r.URL.Query().Get("clientSessionId") - } - if clientSessionId == "" { - clientSessionId = legacyClientSessionId - } - var data CombinedSaveData err = json.NewDecoder(r.Body).Decode(&data) if err != nil { @@ -601,7 +593,7 @@ func handleUpdateAll(w http.ResponseWriter, r *http.Request) { } var active bool - active, err = db.IsActiveSession(uuid, clientSessionId) + active, err = db.IsActiveSession(uuid, data.ClientSessionId) if err != nil { httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest) return From e4713e6ea3bdda3a9ec0c7582a485ba1774f6228 Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 04:08:42 +0200 Subject: [PATCH 05/24] fall back to legacy save ID --- api/endpoints.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/endpoints.go b/api/endpoints.go index 4d80a42..2cf8bcb 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -591,6 +591,9 @@ func handleUpdateAll(w http.ResponseWriter, r *http.Request) { httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest) return } + if data.ClientSessionId == "" { + data.ClientSessionId = legacyClientSessionId + } var active bool active, err = db.IsActiveSession(uuid, data.ClientSessionId) From a063b1740c452755e7df5a3b5a688b921df06443 Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 04:12:20 +0200 Subject: [PATCH 06/24] add missing foreign key declarations --- db/db.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/db.go b/db/db.go index 4ee1a71..998af39 100644 --- a/db/db.go +++ b/db/db.go @@ -167,9 +167,9 @@ func setupDb(tx *sql.Tx) error { `CREATE TABLE IF NOT EXISTS accountDailyRuns (uuid BINARY(16) NOT NULL, date DATE NOT NULL, score INT(11) NOT NULL DEFAULT 0, wave INT(11) NOT NULL DEFAULT 0, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (uuid, date), CONSTRAINT accountDailyRuns_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT accountDailyRuns_ibfk_2 FOREIGN KEY (date) REFERENCES dailyRuns (date) ON DELETE NO ACTION ON UPDATE NO ACTION)`, `CREATE INDEX IF NOT EXISTS accountDailyRunsByDate ON accountDailyRuns (date)`, - `CREATE TABLE IF NOT EXISTS systemSaveData (uuid BINARY(16) PRIMARY KEY, data LONGBLOB, timestamp TIMESTAMP)`, + `CREATE TABLE IF NOT EXISTS systemSaveData (uuid BINARY(16) PRIMARY KEY, data LONGBLOB, timestamp TIMESTAMP, FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`, - `CREATE TABLE IF NOT EXISTS sessionSaveData (uuid BINARY(16), slot TINYINT, data LONGBLOB, timestamp TIMESTAMP, PRIMARY KEY (uuid, slot))`, + `CREATE TABLE IF NOT EXISTS sessionSaveData (uuid BINARY(16), slot TINYINT, data LONGBLOB, timestamp TIMESTAMP, PRIMARY KEY (uuid, slot), FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`, // ---------------------------------- // MIGRATION 001 From 76e7ba02ade1706bb4c3726748ebde7cc421ff70 Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 04:27:53 +0200 Subject: [PATCH 07/24] always delete claimed vouchers --- api/savedata/update.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/savedata/update.go b/api/savedata/update.go index 58eee72..6876b57 100644 --- a/api/savedata/update.go +++ b/api/savedata/update.go @@ -47,6 +47,11 @@ func Update(uuid []byte, slot int, save any) error { return fmt.Errorf("failed to update account stats: %s", err) } + err = db.DeleteClaimedAccountCompensations(uuid) + if err != nil { + return fmt.Errorf("failed to delete claimed compensations: %s", err) + } + return db.StoreSystemSaveData(uuid, save) case defs.SessionSaveData: // Session From c17c583321f6b4fd86ac6f1212102484559793ec Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 06:46:08 +0200 Subject: [PATCH 08/24] update active session if none is found --- db/account.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/db/account.go b/db/account.go index a54b7bc..47f24c2 100644 --- a/db/account.go +++ b/db/account.go @@ -215,17 +215,14 @@ func IsActiveSession(uuid []byte, clientSessionId string) (bool, error) { err := handle.QueryRow("SELECT clientSessionId FROM activeClientSessions WHERE uuid = ?", uuid).Scan(&storedId) if err != nil { if errors.Is(err, sql.ErrNoRows) { - return false, nil + err = UpdateActiveSession(uuid, clientSessionId) + if err != nil { + return false, err + } + return true, nil } return false, err } - if storedId == "" { - err = UpdateActiveSession(uuid, clientSessionId) - if err != nil { - return false, err - } - return true, nil - } return storedId == clientSessionId, nil } From f31f130c147e01c81b75c86d4d7d607e5b976c9d Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 06:47:06 +0200 Subject: [PATCH 09/24] also check for empty --- db/account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/account.go b/db/account.go index 47f24c2..23a1a6d 100644 --- a/db/account.go +++ b/db/account.go @@ -224,7 +224,7 @@ func IsActiveSession(uuid []byte, clientSessionId string) (bool, error) { return false, err } - return storedId == clientSessionId, nil + return storedId == "" || storedId == clientSessionId, nil } func UpdateActiveSession(uuid []byte, clientSessionId string) error { From 509ca8df1275f786e69b1107e41c1d43cd5c875f Mon Sep 17 00:00:00 2001 From: Up Date: Wed, 15 May 2024 07:28:49 +0200 Subject: [PATCH 10/24] better errors --- api/endpoints.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/endpoints.go b/api/endpoints.go index 2cf8bcb..15288f0 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -297,19 +297,19 @@ func clearSessionData(w http.ResponseWriter, r *http.Request) { if storedTrainerId > 0 || storedSecretId > 0 { if trainerId != storedTrainerId || secretId != storedSecretId { - httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest) + httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest) return } } else { err = db.UpdateTrainerIds(trainerId, secretId, uuid) if err != nil { - httpError(w, r, fmt.Errorf("unable to update traienr ID: %s", err), http.StatusInternalServerError) + httpError(w, r, fmt.Errorf("unable to update trainer ID: %s", err), http.StatusInternalServerError) return } } if !active { - save = savedata.ClearResponse{Error: "session out of date"} + save = savedata.ClearResponse{Error: "session out of date: not active"} } var seed string @@ -362,7 +362,7 @@ func deleteSystemSave(w http.ResponseWriter, r *http.Request) { } if !active { - httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest) + httpError(w, r, fmt.Errorf("session out of date: not active"), http.StatusBadRequest) return } @@ -390,7 +390,7 @@ func deleteSystemSave(w http.ResponseWriter, r *http.Request) { if storedTrainerId > 0 || storedSecretId > 0 { if trainerId != storedTrainerId || secretId != storedSecretId { - httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest) + httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest) return } } else { @@ -485,7 +485,7 @@ func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) { // TODO: make this not suck if !active && r.URL.Path != "/savedata/clear" { - httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest) + httpError(w, r, fmt.Errorf("session out of date: not active"), http.StatusBadRequest) return } @@ -518,7 +518,7 @@ func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) { if storedTrainerId > 0 || storedSecretId > 0 { if trainerId != storedTrainerId || secretId != storedSecretId { - httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest) + httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest) return } } else { @@ -543,7 +543,7 @@ func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) { case "/savedata/clear": if !active { // TODO: make this not suck - save = savedata.ClearResponse{Error: "session out of date"} + save = savedata.ClearResponse{Error: "session out of date: not active"} break } @@ -603,7 +603,7 @@ func handleUpdateAll(w http.ResponseWriter, r *http.Request) { } if !active { - httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest) + httpError(w, r, fmt.Errorf("session out of date: not active"), http.StatusBadRequest) return } @@ -618,7 +618,7 @@ func handleUpdateAll(w http.ResponseWriter, r *http.Request) { if storedTrainerId > 0 || storedSecretId > 0 { if trainerId != storedTrainerId || secretId != storedSecretId { - httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest) + httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest) return } } else { From df92ff8b6fcbaae0e3bccda4bb104e391751fc61 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Wed, 15 May 2024 13:37:36 -0400 Subject: [PATCH 11/24] Add last activity update on verify --- api/endpoints.go | 6 ++++++ db/game.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/endpoints.go b/api/endpoints.go index 15288f0..47c5847 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -693,6 +693,12 @@ func handleSystemVerify(w http.ResponseWriter, r *http.Request) { response.SystemData = &storedSaveData } + err = db.UpdateAccountLastActivity(uuid) + if err != nil { + httpError(w, r, fmt.Errorf("failed to update account last activity: %s", err), http.StatusInternalServerError) + return + } + jsonResponse(w, r, response) } diff --git a/db/game.go b/db/game.go index 9d29780..ac37115 100644 --- a/db/game.go +++ b/db/game.go @@ -29,7 +29,7 @@ func FetchPlayerCount() (int, error) { func FetchBattleCount() (int, error) { var battleCount int - err := handle.QueryRow("SELECT COALESCE(SUM(battles), 0) FROM accountStats").Scan(&battleCount) + err := handle.QueryRow("SELECT COALESCE(SUM(s.battles), 0) FROM accountStats s JOIN accounts a ON a.uuid = s.uuid WHERE a.banned = 0").Scan(&battleCount) if err != nil { return 0, err } @@ -39,7 +39,7 @@ func FetchBattleCount() (int, error) { func FetchClassicSessionCount() (int, error) { var classicSessionCount int - err := handle.QueryRow("SELECT COALESCE(SUM(classicSessionsPlayed), 0) FROM accountStats").Scan(&classicSessionCount) + err := handle.QueryRow("SELECT COALESCE(SUM(s.classicSessionsPlayed), 0) FROM accountStats s JOIN accounts a ON a.uuid = s.uuid WHERE a.banned = 0").Scan(&classicSessionCount) if err != nil { return 0, err } From fc458fad739d67519150ee921072fdb58edac6d0 Mon Sep 17 00:00:00 2001 From: maru Date: Tue, 21 May 2024 01:39:07 -0400 Subject: [PATCH 12/24] Revert "Remove anti cheat" This reverts commit 512a24e5c3b1a51045a91acd9049c64266cc6d64. --- api/savedata/clear.go | 4 ++++ api/savedata/update.go | 7 +++++++ db/account.go | 9 +++++++++ db/daily.go | 4 ++-- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/api/savedata/clear.go b/api/savedata/clear.go index 661ead7..917c08b 100644 --- a/api/savedata/clear.go +++ b/api/savedata/clear.go @@ -50,6 +50,10 @@ func Clear(uuid []byte, slot int, seed string, save defs.SessionSaveData) (Clear waveCompleted-- } + if save.Score >= 20000 { + db.SetAccountLimited(uuid, true) + } + err = db.AddOrUpdateAccountDailyRun(uuid, save.Score, waveCompleted) if err != nil { log.Printf("failed to add or update daily run record: %s", err) diff --git a/api/savedata/update.go b/api/savedata/update.go index 6876b57..ebcf4b7 100644 --- a/api/savedata/update.go +++ b/api/savedata/update.go @@ -42,6 +42,13 @@ func Update(uuid []byte, slot int, save any) error { return fmt.Errorf("client version out of date") } + if save.VoucherCounts["0"] > 300 || + save.VoucherCounts["1"] > 150 || + save.VoucherCounts["2"] > 100 || + save.VoucherCounts["3"] > 10 { + db.SetAccountLimited(uuid, true) + } + err = db.UpdateAccountStats(uuid, save.GameStats, save.VoucherCounts) if err != nil { return fmt.Errorf("failed to update account stats: %s", err) diff --git a/db/account.go b/db/account.go index 23a1a6d..42d6b6e 100644 --- a/db/account.go +++ b/db/account.go @@ -145,6 +145,15 @@ func UpdateAccountStats(uuid []byte, stats defs.GameStats, voucherCounts map[str return nil } +func SetAccountLimited(uuid []byte, limited bool) error { + _, err := handle.Exec("UPDATE accounts SET limited = ? WHERE uuid = ?", limited, uuid) + if err != nil { + return err + } + + return nil +} + func FetchAndClaimAccountCompensations(uuid []byte) (map[int]int, error) { var compensations = make(map[int]int) diff --git a/db/daily.go b/db/daily.go index e30574a..09c1c39 100644 --- a/db/daily.go +++ b/db/daily.go @@ -61,9 +61,9 @@ func FetchRankings(category int, page int) ([]defs.DailyRanking, error) { var query string switch category { case 0: - query = "SELECT RANK() OVER (ORDER BY adr.score DESC, adr.timestamp), a.username, adr.score, adr.wave FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date = UTC_DATE() AND a.banned = 0 LIMIT 10 OFFSET ?" + query = "SELECT RANK() OVER (ORDER BY adr.score DESC, adr.timestamp), a.username, adr.score, adr.wave FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date = UTC_DATE() AND a.limited = 0 LIMIT 10 OFFSET ?" case 1: - query = "SELECT RANK() OVER (ORDER BY SUM(adr.score) DESC, adr.timestamp), a.username, SUM(adr.score), 0 FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date >= DATE_SUB(DATE(UTC_TIMESTAMP()), INTERVAL DAYOFWEEK(UTC_TIMESTAMP()) - 1 DAY) AND a.banned = 0 GROUP BY a.username ORDER BY 1 LIMIT 10 OFFSET ?" + query = "SELECT RANK() OVER (ORDER BY SUM(adr.score) DESC, adr.timestamp), a.username, SUM(adr.score), 0 FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date >= DATE_SUB(DATE(UTC_TIMESTAMP()), INTERVAL DAYOFWEEK(UTC_TIMESTAMP()) - 1 DAY) AND a.limited = 0 GROUP BY a.username ORDER BY 1 LIMIT 10 OFFSET ?" } results, err := handle.Query(query, offset) From f8f5aefff9713b46b6f86c2dfefe76f188083142 Mon Sep 17 00:00:00 2001 From: maru Date: Tue, 21 May 2024 01:45:03 -0400 Subject: [PATCH 13/24] Better logging --- api/daily/rankings.go | 4 +--- api/daily/rankingspagecount.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/api/daily/rankings.go b/api/daily/rankings.go index b3ac2b6..a54c0a0 100644 --- a/api/daily/rankings.go +++ b/api/daily/rankings.go @@ -18,8 +18,6 @@ package daily import ( - "log" - "github.com/pagefaultgames/rogueserver/db" "github.com/pagefaultgames/rogueserver/defs" ) @@ -28,7 +26,7 @@ import ( func Rankings(category, page int) ([]defs.DailyRanking, error) { rankings, err := db.FetchRankings(category, page) if err != nil { - log.Print("failed to retrieve rankings") + return rankings, err } return rankings, nil diff --git a/api/daily/rankingspagecount.go b/api/daily/rankingspagecount.go index 458cbd6..32b0e65 100644 --- a/api/daily/rankingspagecount.go +++ b/api/daily/rankingspagecount.go @@ -18,8 +18,6 @@ package daily import ( - "log" - "github.com/pagefaultgames/rogueserver/db" ) @@ -27,7 +25,7 @@ import ( func RankingPageCount(category int) (int, error) { pageCount, err := db.FetchRankingPageCount(category) if err != nil { - log.Print("failed to retrieve ranking page count") + return pageCount, err } return pageCount, nil From 7bfd9dfba7acbfd2cca1005af1ef7737aa82ca58 Mon Sep 17 00:00:00 2001 From: maru Date: Tue, 21 May 2024 01:48:07 -0400 Subject: [PATCH 14/24] Fix code --- api/savedata/clear.go | 2 +- api/savedata/update.go | 2 +- db/account.go | 4 ++-- db/daily.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/savedata/clear.go b/api/savedata/clear.go index 917c08b..69f767e 100644 --- a/api/savedata/clear.go +++ b/api/savedata/clear.go @@ -51,7 +51,7 @@ func Clear(uuid []byte, slot int, seed string, save defs.SessionSaveData) (Clear } if save.Score >= 20000 { - db.SetAccountLimited(uuid, true) + db.SetAccountBanned(uuid, true) } err = db.AddOrUpdateAccountDailyRun(uuid, save.Score, waveCompleted) diff --git a/api/savedata/update.go b/api/savedata/update.go index ebcf4b7..59ceb6f 100644 --- a/api/savedata/update.go +++ b/api/savedata/update.go @@ -46,7 +46,7 @@ func Update(uuid []byte, slot int, save any) error { save.VoucherCounts["1"] > 150 || save.VoucherCounts["2"] > 100 || save.VoucherCounts["3"] > 10 { - db.SetAccountLimited(uuid, true) + db.SetAccountBanned(uuid, true) } err = db.UpdateAccountStats(uuid, save.GameStats, save.VoucherCounts) diff --git a/db/account.go b/db/account.go index 42d6b6e..513803e 100644 --- a/db/account.go +++ b/db/account.go @@ -145,8 +145,8 @@ func UpdateAccountStats(uuid []byte, stats defs.GameStats, voucherCounts map[str return nil } -func SetAccountLimited(uuid []byte, limited bool) error { - _, err := handle.Exec("UPDATE accounts SET limited = ? WHERE uuid = ?", limited, uuid) +func SetAccountBanned(uuid []byte, banned bool) error { + _, err := handle.Exec("UPDATE accounts SET banned = ? WHERE uuid = ?", banned, uuid) if err != nil { return err } diff --git a/db/daily.go b/db/daily.go index 09c1c39..e30574a 100644 --- a/db/daily.go +++ b/db/daily.go @@ -61,9 +61,9 @@ func FetchRankings(category int, page int) ([]defs.DailyRanking, error) { var query string switch category { case 0: - query = "SELECT RANK() OVER (ORDER BY adr.score DESC, adr.timestamp), a.username, adr.score, adr.wave FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date = UTC_DATE() AND a.limited = 0 LIMIT 10 OFFSET ?" + query = "SELECT RANK() OVER (ORDER BY adr.score DESC, adr.timestamp), a.username, adr.score, adr.wave FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date = UTC_DATE() AND a.banned = 0 LIMIT 10 OFFSET ?" case 1: - query = "SELECT RANK() OVER (ORDER BY SUM(adr.score) DESC, adr.timestamp), a.username, SUM(adr.score), 0 FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date >= DATE_SUB(DATE(UTC_TIMESTAMP()), INTERVAL DAYOFWEEK(UTC_TIMESTAMP()) - 1 DAY) AND a.limited = 0 GROUP BY a.username ORDER BY 1 LIMIT 10 OFFSET ?" + query = "SELECT RANK() OVER (ORDER BY SUM(adr.score) DESC, adr.timestamp), a.username, SUM(adr.score), 0 FROM accountDailyRuns adr JOIN dailyRuns dr ON dr.date = adr.date JOIN accounts a ON adr.uuid = a.uuid WHERE dr.date >= DATE_SUB(DATE(UTC_TIMESTAMP()), INTERVAL DAYOFWEEK(UTC_TIMESTAMP()) - 1 DAY) AND a.banned = 0 GROUP BY a.username ORDER BY 1 LIMIT 10 OFFSET ?" } results, err := handle.Query(query, offset) From 805ac408e863268c336df7abad14a80ab9b78917 Mon Sep 17 00:00:00 2001 From: maru Date: Tue, 21 May 2024 17:49:20 -0400 Subject: [PATCH 15/24] Don't use := false --- api/savedata/get.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/savedata/get.go b/api/savedata/get.go index 3a1cecb..dcf8232 100644 --- a/api/savedata/get.go +++ b/api/savedata/get.go @@ -44,7 +44,7 @@ func Get(uuid []byte, datatype, slot int) (any, error) { return nil, fmt.Errorf("failed to fetch compensations: %s", err) } - needsUpdate := false + var needsUpdate bool for compensationType, amount := range compensations { system.VoucherCounts[strconv.Itoa(compensationType)] += amount if amount > 0 { From 1441d476944fc2780d5f906416210ea39353dc68 Mon Sep 17 00:00:00 2001 From: maru Date: Tue, 21 May 2024 17:53:28 -0400 Subject: [PATCH 16/24] Remove legacy save migration code --- db/db.go | 80 +------------------------------------------------ db/legacy.go | 84 ---------------------------------------------------- 2 files changed, 1 insertion(+), 163 deletions(-) delete mode 100644 db/legacy.go diff --git a/db/db.go b/db/db.go index 998af39..c1f1a7c 100644 --- a/db/db.go +++ b/db/db.go @@ -19,10 +19,8 @@ package db import ( "database/sql" - "encoding/hex" "fmt" "log" - "os" "time" _ "github.com/go-sql-driver/mysql" @@ -55,7 +53,7 @@ func Init(username, password, protocol, address, database string) error { err = setupDb(tx) if err != nil { - _ = tx.Rollback() + tx.Rollback() log.Fatal(err) } @@ -64,82 +62,6 @@ func Init(username, password, protocol, address, database string) error { log.Fatal(err) } - // TODO temp code - _, err = os.Stat("userdata") - if err != nil { - if !os.IsNotExist(err) { // not found, do not migrate - log.Fatalf("failed to stat userdata directory: %s", err) - } - - return nil - } - - entries, err := os.ReadDir("userdata") - if err != nil { - log.Fatal(err) - } - - for _, entry := range entries { - if !entry.IsDir() { - continue - } - - uuidString := entry.Name() - uuid, err := hex.DecodeString(uuidString) - if err != nil { - log.Printf("failed to decode uuid: %s", err) - continue - } - - var count int - err = handle.QueryRow("SELECT COUNT(*) FROM systemSaveData WHERE uuid = ?", uuid).Scan(&count) - if err != nil || count != 0 { - continue - } - - // store new system data - systemData, err := LegacyReadSystemSaveData(uuid) - if err != nil { - log.Printf("failed to read system save data for %v: %s", uuidString, err) - continue - } - - err = StoreSystemSaveData(uuid, systemData) - if err != nil { - log.Fatalf("failed to store system save data for %v: %s\n", uuidString, err) - } - - // delete old system data - err = os.Remove("userdata/" + uuidString + "/system.pzs") - if err != nil { - log.Fatalf("failed to remove legacy system save data for %v: %s", uuidString, err) - } - - for i := 0; i < 5; i++ { - sessionData, err := LegacyReadSessionSaveData(uuid, i) - if err != nil { - log.Printf("failed to read session save data %v for %v: %s", i, uuidString, err) - continue - } - - // store new session data - err = StoreSessionSaveData(uuid, sessionData, i) - if err != nil { - log.Fatalf("failed to store session save data for %v: %s\n", uuidString, err) - } - - // delete old session data - filename := "session" - if i != 0 { - filename += fmt.Sprintf("%d", i) - } - err = os.Remove(fmt.Sprintf("userdata/%s/%s.pzs", uuidString, filename)) - if err != nil { - log.Fatalf("failed to remove legacy session save data %v for %v: %s", i, uuidString, err) - } - } - } - return nil } diff --git a/db/legacy.go b/db/legacy.go deleted file mode 100644 index f9b5848..0000000 --- a/db/legacy.go +++ /dev/null @@ -1,84 +0,0 @@ -/* - Copyright (C) 2024 Pagefault Games - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package db - -import ( - "encoding/gob" - "encoding/hex" - "fmt" - "os" - "strconv" - - "github.com/klauspost/compress/zstd" - "github.com/pagefaultgames/rogueserver/defs" -) - -func LegacyReadSystemSaveData(uuid []byte) (defs.SystemSaveData, error) { - var system defs.SystemSaveData - - file, err := os.Open("userdata/" + hex.EncodeToString(uuid) + "/system.pzs") - if err != nil { - return system, fmt.Errorf("failed to open save file for reading: %s", err) - } - - defer file.Close() - - zstdDecoder, err := zstd.NewReader(file) - if err != nil { - return system, fmt.Errorf("failed to create zstd decoder: %s", err) - } - - defer zstdDecoder.Close() - - err = gob.NewDecoder(zstdDecoder).Decode(&system) - if err != nil { - return system, fmt.Errorf("failed to deserialize save: %s", err) - } - - return system, nil -} - -func LegacyReadSessionSaveData(uuid []byte, slotID int) (defs.SessionSaveData, error) { - var session defs.SessionSaveData - - fileName := "session" - if slotID != 0 { - fileName += strconv.Itoa(slotID) - } - - file, err := os.Open(fmt.Sprintf("userdata/%s/%s.pzs", hex.EncodeToString(uuid), fileName)) - if err != nil { - return session, fmt.Errorf("failed to open save file for reading: %s", err) - } - - defer file.Close() - - zstdDecoder, err := zstd.NewReader(file) - if err != nil { - return session, fmt.Errorf("failed to create zstd decoder: %s", err) - } - - defer zstdDecoder.Close() - - err = gob.NewDecoder(zstdDecoder).Decode(&session) - if err != nil { - return session, fmt.Errorf("failed to deserialize save: %s", err) - } - - return session, nil -} From 568697bc1ff58d456c95d9589e86a4d5a086527e Mon Sep 17 00:00:00 2001 From: maru Date: Tue, 21 May 2024 17:59:11 -0400 Subject: [PATCH 17/24] Remove unused dependencies --- go.mod | 1 - go.sum | 2 -- 2 files changed, 3 deletions(-) diff --git a/go.mod b/go.mod index ed86e1f..eba1467 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.22 require ( github.com/go-sql-driver/mysql v1.7.1 - github.com/klauspost/compress v1.17.4 github.com/robfig/cron/v3 v3.0.1 golang.org/x/crypto v0.16.0 ) diff --git a/go.sum b/go.sum index 88cd836..ee42aae 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= From 4cc2d3431c2fa4869a1a2c21e37f11f04ec31290 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 23 May 2024 13:18:37 -0400 Subject: [PATCH 18/24] Set conns value to 128 --- db/db.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/db/db.go b/db/db.go index c1f1a7c..359beb2 100644 --- a/db/db.go +++ b/db/db.go @@ -36,10 +36,7 @@ func Init(username, password, protocol, address, database string) error { return fmt.Errorf("failed to open database connection: %s", err) } - conns := 1024 - if protocol != "unix" { - conns = 256 - } + conns := 128 handle.SetMaxOpenConns(conns) handle.SetMaxIdleConns(conns / 4) From 15a32c0e23cb3832b3e1f98f0a82a03eff9c3861 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 23 May 2024 14:15:44 -0400 Subject: [PATCH 19/24] Various cleanup --- api/common.go | 13 +++++++++---- api/endpoints.go | 24 ++++++++++++------------ api/savedata/delete.go | 17 ++++++++++++----- db/daily.go | 1 - 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/api/common.go b/api/common.go index bdd5aab..e80b432 100644 --- a/api/common.go +++ b/api/common.go @@ -21,11 +21,12 @@ import ( "encoding/base64" "encoding/json" "fmt" + "log" + "net/http" + "github.com/pagefaultgames/rogueserver/api/account" "github.com/pagefaultgames/rogueserver/api/daily" "github.com/pagefaultgames/rogueserver/db" - "log" - "net/http" ) func Init(mux *http.ServeMux) error { @@ -86,7 +87,11 @@ func tokenFromRequest(r *http.Request) ([]byte, error) { func uuidFromRequest(r *http.Request) ([]byte, error) { _, uuid, err := tokenAndUuidFromRequest(r) - return uuid, err + if err != nil { + return nil, err + } + + return uuid, nil } func tokenAndUuidFromRequest(r *http.Request) ([]byte, []byte, error) { @@ -108,7 +113,7 @@ func httpError(w http.ResponseWriter, r *http.Request, err error, code int) { http.Error(w, err.Error(), code) } -func jsonResponse(w http.ResponseWriter, r *http.Request, data any) { +func writeJSON(w http.ResponseWriter, r *http.Request, data any) { w.Header().Set("Content-Type", "application/json") err := json.NewEncoder(w).Encode(data) if err != nil { diff --git a/api/endpoints.go b/api/endpoints.go index 47c5847..9eb4809 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -59,7 +59,7 @@ func handleAccountInfo(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, response) + writeJSON(w, r, response) } func handleAccountRegister(w http.ResponseWriter, r *http.Request) { @@ -91,7 +91,7 @@ func handleAccountLogin(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, response) + writeJSON(w, r, response) } func handleAccountChangePW(w http.ResponseWriter, r *http.Request) { @@ -139,7 +139,7 @@ func handleGameTitleStats(w http.ResponseWriter, r *http.Request) { BattleCount: battleCount, } - jsonResponse(w, r, stats) + writeJSON(w, r, stats) } func handleGameClassicSessionCount(w http.ResponseWriter, r *http.Request) { @@ -187,7 +187,7 @@ func handleGetSessionData(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, save) + writeJSON(w, r, save) } const legacyClientSessionId = "LEGACY_CLIENT" @@ -237,11 +237,11 @@ func legacyHandleGetSaveData(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, save) + writeJSON(w, r, save) } // FIXME UNFINISHED!!! -func clearSessionData(w http.ResponseWriter, r *http.Request) { +/*func clearSessionData(w http.ResponseWriter, r *http.Request) { uuid, err := uuidFromRequest(r) if err != nil { httpError(w, r, err, http.StatusBadRequest) @@ -407,7 +407,7 @@ func deleteSystemSave(w http.ResponseWriter, r *http.Request) { } w.WriteHeader(http.StatusOK) -} +}*/ func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) { uuid, err := uuidFromRequest(r) @@ -567,7 +567,7 @@ func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, save) + writeJSON(w, r, save) } type CombinedSaveData struct { @@ -699,7 +699,7 @@ func handleSystemVerify(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, response) + writeJSON(w, r, response) } func handleGetSystemData(w http.ResponseWriter, r *http.Request) { @@ -735,7 +735,7 @@ func handleGetSystemData(w http.ResponseWriter, r *http.Request) { } //TODO apply vouchers - jsonResponse(w, r, save) + writeJSON(w, r, save) } func legacyHandleNewClear(w http.ResponseWriter, r *http.Request) { @@ -760,7 +760,7 @@ func legacyHandleNewClear(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, newClear) + writeJSON(w, r, newClear) } // daily @@ -804,7 +804,7 @@ func handleDailyRankings(w http.ResponseWriter, r *http.Request) { return } - jsonResponse(w, r, rankings) + writeJSON(w, r, rankings) } func handleDailyRankingPageCount(w http.ResponseWriter, r *http.Request) { diff --git a/api/savedata/delete.go b/api/savedata/delete.go index 77183d0..7285328 100644 --- a/api/savedata/delete.go +++ b/api/savedata/delete.go @@ -19,9 +19,10 @@ package savedata import ( "fmt" + "log" + "github.com/pagefaultgames/rogueserver/db" "github.com/pagefaultgames/rogueserver/defs" - "log" ) // /savedata/delete - delete save data @@ -33,14 +34,20 @@ func Delete(uuid []byte, datatype, slot int) error { switch datatype { case 0: // System - return db.DeleteSystemSaveData(uuid) + err = db.DeleteSystemSaveData(uuid) case 1: // Session if slot < 0 || slot >= defs.SessionSlotCount { - return fmt.Errorf("slot id %d out of range", slot) + err = fmt.Errorf("slot id %d out of range", slot) + break } - return db.DeleteSessionSaveData(uuid, slot) + err = db.DeleteSessionSaveData(uuid, slot) default: - return fmt.Errorf("invalid data type") + err = fmt.Errorf("invalid data type") } + if err != nil { + return err + } + + return nil } diff --git a/db/daily.go b/db/daily.go index e30574a..fbd0e36 100644 --- a/db/daily.go +++ b/db/daily.go @@ -41,7 +41,6 @@ func GetDailyRunSeed() (string, error) { } return seed, nil - } func AddOrUpdateAccountDailyRun(uuid []byte, score int, wave int) error { From 3489ae91bf87c77687e36329d389be2c0534d2d3 Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 24 May 2024 01:32:33 -0400 Subject: [PATCH 20/24] Change max connections code again --- db/db.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/db/db.go b/db/db.go index 359beb2..0e21c9c 100644 --- a/db/db.go +++ b/db/db.go @@ -21,7 +21,6 @@ import ( "database/sql" "fmt" "log" - "time" _ "github.com/go-sql-driver/mysql" ) @@ -36,12 +35,10 @@ func Init(username, password, protocol, address, database string) error { return fmt.Errorf("failed to open database connection: %s", err) } - conns := 128 + conns := 64 handle.SetMaxOpenConns(conns) - handle.SetMaxIdleConns(conns / 4) - - handle.SetConnMaxIdleTime(time.Second * 10) + handle.SetMaxIdleConns(conns) tx, err := handle.Begin() if err != nil { From c76746ad358d4a8294fdc87602e39d642ae8a623 Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 24 May 2024 01:41:50 -0400 Subject: [PATCH 21/24] Replace REPLACE INTO usage --- db/account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/account.go b/db/account.go index 513803e..0d2cd8a 100644 --- a/db/account.go +++ b/db/account.go @@ -237,7 +237,7 @@ func IsActiveSession(uuid []byte, clientSessionId string) (bool, error) { } func UpdateActiveSession(uuid []byte, clientSessionId string) error { - _, err := handle.Exec("REPLACE INTO activeClientSessions VALUES (?, ?)", uuid, clientSessionId) + _, err := handle.Exec("INSERT INTO activeClientSessions (uuid, clientSessionId) VALUES (?, ?) ON DUPLICATE KEY UPDATE clientSessionId = ?", uuid, clientSessionId, clientSessionId) if err != nil { return err } From 476e667572baccfc59429cd7befea2d401bc07fb Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 24 May 2024 01:47:36 -0400 Subject: [PATCH 22/24] More cleanup --- db/account.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/db/account.go b/db/account.go index 0d2cd8a..9ac1ec2 100644 --- a/db/account.go +++ b/db/account.go @@ -219,21 +219,23 @@ func UpdateTrainerIds(trainerId, secretId int, uuid []byte) error { return nil } -func IsActiveSession(uuid []byte, clientSessionId string) (bool, error) { - var storedId string - err := handle.QueryRow("SELECT clientSessionId FROM activeClientSessions WHERE uuid = ?", uuid).Scan(&storedId) +func IsActiveSession(uuid []byte, sessionId string) (bool, error) { + var id string + err := handle.QueryRow("SELECT clientSessionId FROM activeClientSessions WHERE uuid = ?", uuid).Scan(&id) if err != nil { if errors.Is(err, sql.ErrNoRows) { - err = UpdateActiveSession(uuid, clientSessionId) + err = UpdateActiveSession(uuid, sessionId) if err != nil { return false, err } + return true, nil } + return false, err } - return storedId == "" || storedId == clientSessionId, nil + return id == "" || id == sessionId, nil } func UpdateActiveSession(uuid []byte, clientSessionId string) error { From cd13fe3cffa1052753a6d4c726701258c266ad72 Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 24 May 2024 01:49:35 -0400 Subject: [PATCH 23/24] Use errors.Is everywhere --- api/account/login.go | 3 ++- api/endpoints.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/account/login.go b/api/account/login.go index bfd11be..5fc3e9c 100644 --- a/api/account/login.go +++ b/api/account/login.go @@ -22,6 +22,7 @@ import ( "crypto/rand" "database/sql" "encoding/base64" + "errors" "fmt" "github.com/pagefaultgames/rogueserver/db" @@ -43,7 +44,7 @@ func Login(username, password string) (LoginResponse, error) { key, salt, err := db.FetchAccountKeySaltFromUsername(username) if err != nil { - if err == sql.ErrNoRows { + if errors.Is(err, sql.ErrNoRows) { return response, fmt.Errorf("account doesn't exist") } diff --git a/api/endpoints.go b/api/endpoints.go index 9eb4809..88d3416 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -532,7 +532,7 @@ func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { case "/savedata/get": save, err = savedata.Get(uuid, datatype, slot) - if err == sql.ErrNoRows { + if errors.Is(err, sql.ErrNoRows) { http.Error(w, err.Error(), http.StatusNotFound) return } From b113ffceee027bb3722ae8b3c8bc9bc61c4f919e Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 24 May 2024 16:17:03 -0400 Subject: [PATCH 24/24] Clean up api Init --- api/common.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/api/common.go b/api/common.go index e80b432..e1666f5 100644 --- a/api/common.go +++ b/api/common.go @@ -30,10 +30,13 @@ import ( ) func Init(mux *http.ServeMux) error { - if err := scheduleStatRefresh(); err != nil { + err := scheduleStatRefresh() + if err != nil { return err } - if err := daily.Init(); err != nil { + + err = daily.Init() + if err != nil { return err } @@ -65,6 +68,7 @@ func Init(mux *http.ServeMux) error { mux.HandleFunc("GET /daily/seed", handleDailySeed) mux.HandleFunc("GET /daily/rankings", handleDailyRankings) mux.HandleFunc("GET /daily/rankingpagecount", handleDailyRankingPageCount) + return nil }