Merge branch 'pagefaultgames:master' into master

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

api/daily/rankingspagecount.go

@@ -18,16 +18,14 @@
 package daily
 
 import (
-	"log"
-
 	"github.com/pagefaultgames/rogueserver/db"
 )
 
 // /daily/rankingpagecount - fetch daily ranking page count
 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

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.SetAccountBanned(uuid, true)
+		}
+
 		err = db.AddOrUpdateAccountDailyRun(uuid, save.Score, waveCompleted)
 		if err != nil {
 			log.Printf("failed to add or update daily run record: %s", err)

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.SetAccountBanned(uuid, true)
+		}
+
 		err = db.UpdateAccountStats(uuid, save.GameStats, save.VoucherCounts)
 		if err != nil {
 			return fmt.Errorf("failed to update account stats: %s", err)

db/account.go

@@ -145,6 +145,15 @@ func UpdateAccountStats(uuid []byte, stats defs.GameStats, voucherCounts map[str
 	return nil
 }
 
+func SetAccountBanned(uuid []byte, banned bool) error {
+	_, err := handle.Exec("UPDATE accounts SET banned = ? WHERE uuid = ?", banned, uuid)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func FetchAndClaimAccountCompensations(uuid []byte) (map[int]int, error) {
 	var compensations = make(map[int]int)