From 147274ebcbb99c9a6f7fab977db0c5c70759c7bf Mon Sep 17 00:00:00 2001
From: Alicia <contact@ilyt.cc>
Date: Sun, 3 Feb 2019 12:59:47 +0000
Subject: [PATCH] All 3 in 1

---
 app/v1/user_scores_ap.go    | 22 +++++++++++-----------
 app/v1/user_scores_relax.go | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/v1/user_scores_ap.go b/app/v1/user_scores_ap.go
index 817dbce..d0ff5b5 100644
--- a/app/v1/user_scores_ap.go
+++ b/app/v1/user_scores_ap.go
@@ -9,17 +9,17 @@ import (
 	"zxq.co/x/getrank"
 )
 
-type userScore struct {
+type userScoreAuto struct {
 	Score
 	Beatmap beatmap `json:"beatmap"`
 }
 
-type userScoresResponse struct {
+type userScoresResponseAuto struct {
 	common.ResponseBase
-	Scores []userScore `json:"scores"`
+	Scores []userScoreAuto `json:"scores"`
 }
 
-const userScoreSelectBase = `
+const userScoreSelectBaseAp = `
 SELECT
 	scores_auto.id, scores_auto.beatmap_md5, scores_auto.score,
 	scores_auto.max_combo, scores_auto.full_combo, scores_auto.mods,
@@ -50,7 +50,7 @@ func UserScoresBestAPGET(md common.MethodData) common.CodeMessager {
 	if getMode(md.Query("mode")) != "ctb" {
 		mc += " AND scores_auto.pp > 0"
 	}
-	return scoresPuts(md, fmt.Sprintf(
+	return scoresPutsAp(md, fmt.Sprintf(
 		`WHERE
 			scores_auto.completed = '3'
 			AND %s
@@ -67,7 +67,7 @@ func UserScoresRecentAPGET(md common.MethodData) common.CodeMessager {
 	if cm != nil {
 		return *cm
 	}
-	return scoresPuts(md, fmt.Sprintf(
+	return scoresPutsAp(md, fmt.Sprintf(
 		`WHERE
 			%s
 			%s
@@ -77,16 +77,16 @@ func UserScoresRecentAPGET(md common.MethodData) common.CodeMessager {
 	), param)
 }
 
-func scoresPuts(md common.MethodData, whereClause string, params ...interface{}) common.CodeMessager {
-	rows, err := md.DB.Query(userScoreSelectBase+whereClause, params...)
+func scoresPutsAp(md common.MethodData, whereClause string, params ...interface{}) common.CodeMessager {
+	rows, err := md.DB.Query(userScoreSelectBaseAp+whereClause, params...)
 	if err != nil {
 		md.Err(err)
 		return Err500
 	}
-	var scores []userScore
+	var scores []userScoreAuto
 	for rows.Next() {
 		var (
-			us userScore
+			us userScoreAuto
 			b  beatmap
 		)
 		err = rows.Scan(
@@ -120,7 +120,7 @@ func scoresPuts(md common.MethodData, whereClause string, params ...interface{})
 		))
 		scores = append(scores, us)
 	}
-	r := userScoresResponse{}
+	r := userScoresResponseAuto{}
 	r.Code = 200
 	r.Scores = scores
 	return r
diff --git a/app/v1/user_scores_relax.go b/app/v1/user_scores_relax.go
index 31287de..6baea8c 100644
--- a/app/v1/user_scores_relax.go
+++ b/app/v1/user_scores_relax.go
@@ -9,17 +9,17 @@ import (
 	"zxq.co/x/getrank"
 )
 
-type userScore struct {
+type userScoreRx struct {
 	Score
 	Beatmap beatmap `json:"beatmap"`
 }
 
-type userScoresResponse struct {
+type userScoresResponseRx struct {
 	common.ResponseBase
-	Scores []userScore `json:"scores"`
+	Scores []userScoreRx `json:"scores"`
 }
 
-const userScoreSelectBase = `
+const userScoreSelectBaseRelax = `
 SELECT
 	scores_relax.id, scores_relax.beatmap_md5, scores_relax.score,
 	scores_relax.max_combo, scores_relax.full_combo, scores_relax.mods,
@@ -50,7 +50,7 @@ func UserScoresBestRelaxGET(md common.MethodData) common.CodeMessager {
 	if getMode(md.Query("mode")) != "ctb" {
 		mc += " AND scores_relax.pp > 0"
 	}
-	return scoresPuts(md, fmt.Sprintf(
+	return scoresPutsRx(md, fmt.Sprintf(
 		`WHERE
 			scores_relax.completed = '3'
 			AND %s
@@ -67,7 +67,7 @@ func UserScoresRecentRelaxGET(md common.MethodData) common.CodeMessager {
 	if cm != nil {
 		return *cm
 	}
-	return scoresPuts(md, fmt.Sprintf(
+	return scoresPutsRx(md, fmt.Sprintf(
 		`WHERE
 			%s
 			%s
@@ -77,16 +77,16 @@ func UserScoresRecentRelaxGET(md common.MethodData) common.CodeMessager {
 	), param)
 }
 
-func scoresPuts(md common.MethodData, whereClause string, params ...interface{}) common.CodeMessager {
-	rows, err := md.DB.Query(userScoreSelectBase+whereClause, params...)
+func scoresPutsRx(md common.MethodData, whereClause string, params ...interface{}) common.CodeMessager {
+	rows, err := md.DB.Query(userScoreSelectBaseRelax+whereClause, params...)
 	if err != nil {
 		md.Err(err)
 		return Err500
 	}
-	var scores []userScore
+	var scores []userScoreRx
 	for rows.Next() {
 		var (
-			us userScore
+			us userScoreRx
 			b  beatmap
 		)
 		err = rows.Scan(
@@ -120,7 +120,7 @@ func scoresPuts(md common.MethodData, whereClause string, params ...interface{})
 		))
 		scores = append(scores, us)
 	}
-	r := userScoresResponse{}
+	r := userScoresResponseRx{}
 	r.Code = 200
 	r.Scores = scores
 	return r