From ab548485b1fc53cb4fb4be68178d5d4309e8d332 Mon Sep 17 00:00:00 2001 From: lenforiee Date: Mon, 20 Jun 2022 23:01:37 +0200 Subject: [PATCH] [=] update queries for new structure change --- app/hmrapi/friends_sub.go | 7 ++-- app/hmrapi/topdonors.go | 4 +- app/mitsuha/followers.go | 2 +- app/peppy/user.go | 4 +- app/v1/badge.go | 2 +- app/v1/clan.go | 10 ++--- app/v1/friend.go | 2 +- app/v1/leaderboard.go | 12 +++--- app/v1/manage_user.go | 4 +- app/v1/score.go | 29 +++++++------- app/v1/user.go | 79 +++++++++++++++++++-------------------- 11 files changed, 77 insertions(+), 78 deletions(-) diff --git a/app/hmrapi/friends_sub.go b/app/hmrapi/friends_sub.go index cfd6515..263e844 100644 --- a/app/hmrapi/friends_sub.go +++ b/app/hmrapi/friends_sub.go @@ -3,6 +3,7 @@ package hmrapi import ( "database/sql" "strconv" + "github.com/RealistikOsu/RealistikAPI/common" ) @@ -63,7 +64,7 @@ SELECT users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, users_stats.username_aka, - users_stats.country + users.country FROM users_relationships LEFT JOIN users ON users_relationships.user1 = users.id @@ -120,7 +121,7 @@ SELECT users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, users_stats.username_aka, - users_stats.country + users.country FROM users_relationships LEFT JOIN users ON users_relationships.user1 = users.id @@ -138,7 +139,7 @@ WHERE users_relationships.user2=? AND NOT EXISTS (SELECT * FROM users_relationsh var count int = 0 defer results.Close() for results.Next() { - count+=1 + count += 1 } if err := results.Err(); err != nil { diff --git a/app/hmrapi/topdonors.go b/app/hmrapi/topdonors.go index dfdc656..97fff9e 100644 --- a/app/hmrapi/topdonors.go +++ b/app/hmrapi/topdonors.go @@ -22,7 +22,7 @@ type topDonorsResponse struct { const lbUserQuery = ` SELECT users.id, users.username, users_stats.username_aka, users.register_datetime, users.privileges, users.latest_activity, - users_stats.country, users.donor_expire + users.country, users.donor_expire FROM users INNER JOIN users_stats ON users_stats.id = users.id WHERE users.privileges >= 4 AND users.privileges != 1048576 @@ -65,7 +65,7 @@ func TopDonorsGET(md common.MethodData) common.CodeMessager { } } - if len(tempUsers)>8 { + if len(tempUsers) > 8 { sortedUsers := make([]userData, 8) copy(sortedUsers, tempUsers) resp.Users = sortedUsers diff --git a/app/mitsuha/followers.go b/app/mitsuha/followers.go index dcb217f..a6f4864 100644 --- a/app/mitsuha/followers.go +++ b/app/mitsuha/followers.go @@ -38,7 +38,7 @@ const MyFriendsQuery = ` users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, users_stats.username_aka, - users_stats.country + users.country FROM users_relationships LEFT JOIN diff --git a/app/peppy/user.go b/app/peppy/user.go index 01bd0e4..2b6d419 100644 --- a/app/peppy/user.go +++ b/app/peppy/user.go @@ -8,12 +8,12 @@ import ( "strings" + "github.com/RealistikOsu/RealistikAPI/common" "github.com/jmoiron/sqlx" "github.com/thehowl/go-osuapi" "github.com/valyala/fasthttp" "gopkg.in/redis.v5" "zxq.co/ripple/ocl" - "github.com/RealistikOsu/RealistikAPI/common" ) // R is a redis client. @@ -36,7 +36,7 @@ func GetUser(c *fasthttp.RequestCtx, db *sqlx.DB) { users.id, users.username, users_stats.playcount_%s, users_stats.ranked_score_%s, users_stats.total_score_%s, users_stats.pp_%s, users_stats.avg_accuracy_%s, - users_stats.country + users.country FROM users LEFT JOIN users_stats ON users_stats.id = users.id %s diff --git a/app/v1/badge.go b/app/v1/badge.go index 1ace7f2..a6e9f3c 100644 --- a/app/v1/badge.go +++ b/app/v1/badge.go @@ -65,7 +65,7 @@ func BadgeMembersGET(md common.MethodData) common.CodeMessager { err := md.DB.Select(&members.Members, `SELECT users.id, users.username, register_datetime, users.privileges, latest_activity, users_stats.username_aka, - users_stats.country + users.country FROM user_badges ub INNER JOIN users ON users.id = ub.user INNER JOIN users_stats ON users_stats.id = ub.user diff --git a/app/v1/clan.go b/app/v1/clan.go index 9367b1e..c1a083e 100644 --- a/app/v1/clan.go +++ b/app/v1/clan.go @@ -84,7 +84,7 @@ type megaStats struct { const RXClanQuery = `SELECT users.id, users.username, users.register_datetime, users.privileges, latest_activity, rx_stats.username_aka, -rx_stats.country, rx_stats.user_color, +users.country, rx_stats.user_color, rx_stats.ranked_score_std, rx_stats.total_score_std, rx_stats.pp_std, rx_stats.playcount_std, rx_stats.replays_watched_std, rx_stats.total_hits_std, rx_stats.ranked_score_taiko, rx_stats.total_score_taiko, rx_stats.pp_taiko, rx_stats.playcount_taiko, rx_stats.replays_watched_taiko,rx_stats.total_hits_taiko, rx_stats.ranked_score_ctb, rx_stats.total_score_ctb, rx_stats.pp_ctb, rx_stats.playcount_ctb, rx_stats.replays_watched_ctb, rx_stats.total_hits_ctb, @@ -100,7 +100,7 @@ WHERE clan = ? AND privileges & 1 = 1 const VNClanQuery = `SELECT users.id, users.username, users.register_datetime, users.privileges, latest_activity, users_stats.username_aka, -users_stats.country, users_stats.user_color, +users.country, users_stats.user_color, users_stats.ranked_score_std, users_stats.total_score_std, users_stats.pp_std, users_stats.playcount_std, users_stats.replays_watched_std, users_stats.total_hits_std, users_stats.ranked_score_taiko, users_stats.total_score_taiko, users_stats.pp_taiko, users_stats.playcount_taiko, users_stats.replays_watched_taiko,users_stats.total_hits_taiko, users_stats.ranked_score_ctb, users_stats.total_score_ctb, users_stats.pp_ctb, users_stats.playcount_ctb, users_stats.replays_watched_ctb, users_stats.total_hits_ctb, @@ -116,7 +116,7 @@ WHERE clan = ? AND privileges & 1 = 1 const APClanQuery = `SELECT users.id, users.username, users.register_datetime, users.privileges, latest_activity, ap_stats.username_aka, -ap_stats.country, ap_stats.user_color, +users.country, ap_stats.user_color, ap_stats.ranked_score_std, ap_stats.total_score_std, ap_stats.pp_std, ap_stats.playcount_std, ap_stats.replays_watched_std, ap_stats.total_hits_std, ap_stats.ranked_score_taiko, ap_stats.total_score_taiko, ap_stats.pp_taiko, ap_stats.playcount_taiko, ap_stats.replays_watched_taiko,ap_stats.total_hits_taiko, ap_stats.ranked_score_ctb, ap_stats.total_score_ctb, ap_stats.pp_ctb, ap_stats.playcount_ctb, ap_stats.replays_watched_ctb, ap_stats.total_hits_ctb, @@ -483,7 +483,7 @@ func ClanMembersGET(md common.MethodData) common.CodeMessager { err := md.DB.Select(&members.Members, `SELECT users.id, users.username, users.register_datetime, users.privileges, latest_activity, users_stats.username_aka, - users_stats.country, users_stats.user_color, + users.country, users_stats.user_color, users_stats.ranked_score_std, users_stats.total_score_std, users_stats.pp_std, users_stats.playcount_std, users_stats.replays_watched_std, users_stats.total_hits_std, users_stats.ranked_score_taiko, users_stats.total_score_taiko, users_stats.pp_taiko, users_stats.playcount_taiko, users_stats.replays_watched_taiko, users_stats.total_hits_taiko @@ -507,7 +507,7 @@ func ClanMembersGET(md common.MethodData) common.CodeMessager { err := md.DB.Select(&members.Members, `SELECT users.id, users.username, users.register_datetime, users.privileges, latest_activity, users_stats.username_aka, - users_stats.country, users_stats.user_color, + users.country, users_stats.user_color, users_stats.ranked_score_std, users_stats.total_score_std, users_stats.pp_std, users_stats.playcount_std, users_stats.replays_watched_std, users_stats.ranked_score_taiko, users_stats.total_score_taiko, users_stats.pp_taiko, users_stats.playcount_taiko, users_stats.replays_watched_taiko diff --git a/app/v1/friend.go b/app/v1/friend.go index 1d3ce33..888a7cd 100644 --- a/app/v1/friend.go +++ b/app/v1/friend.go @@ -44,7 +44,7 @@ SELECT users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, users_stats.username_aka, - users_stats.country + users.country FROM users_relationships LEFT JOIN users ON users_relationships.user2 = users.id diff --git a/app/v1/leaderboard.go b/app/v1/leaderboard.go index ff71d97..4ff6e55 100644 --- a/app/v1/leaderboard.go +++ b/app/v1/leaderboard.go @@ -29,7 +29,7 @@ const rxUserQuery = ` SELECT users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, - rx_stats.username_aka, users_stats.country, + users_stats.username_aka, users.country, users_stats.play_style, users_stats.favourite_mode, rx_stats.ranked_score_%[1]s, rx_stats.total_score_%[1]s, rx_stats.playcount_%[1]s, @@ -43,7 +43,7 @@ const apUserQuery = ` SELECT users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, - ap_stats.username_aka, users_stats.country, + users_stats.username_aka, users.country, users_stats.play_style, users_stats.favourite_mode, ap_stats.ranked_score_%[1]s, ap_stats.total_score_%[1]s, ap_stats.playcount_%[1]s, @@ -57,7 +57,7 @@ const lbUserQuery = ` SELECT users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, - users_stats.username_aka, users_stats.country, + users_stats.username_aka, users.country, users_stats.play_style, users_stats.favourite_mode, users_stats.ranked_score_%[1]s, users_stats.total_score_%[1]s, users_stats.playcount_%[1]s, @@ -73,19 +73,19 @@ func getScoreLb(m string, rx int, p int, l int, country string, sorted string, m case 1: order = " ORDER BY rx_stats.ranked_score_%[1]s DESC, rx_stats.pp_%[1]s DESC" if country != "" { - whereClause = fmt.Sprintf(" AND users_stats.country = '%s'", strings.ToUpper(country)) + whereClause = fmt.Sprintf(" AND users.country = '%s'", strings.ToUpper(country)) } query = fmt.Sprintf(rxUserQuery+"WHERE (users.privileges & 3) >= 3"+whereClause+order+" LIMIT %d, %d", m, p*l, l) case 2: order = " ORDER BY ap_stats.ranked_score_%[1]s DESC, ap_stats.pp_%[1]s DESC" if country != "" { - whereClause = fmt.Sprintf(" AND users_stats.country = '%s'", strings.ToUpper(country)) + whereClause = fmt.Sprintf(" AND users.country = '%s'", strings.ToUpper(country)) } query = fmt.Sprintf(apUserQuery+"WHERE (users.privileges & 3) >= 3"+whereClause+order+" LIMIT %d, %d", m, p*l, l) default: order = " ORDER BY users_stats.ranked_score_%[1]s DESC, users_stats.pp_%[1]s DESC" if country != "" { - whereClause = fmt.Sprintf(" AND users_stats.country = '%s'", strings.ToUpper(country)) + whereClause = fmt.Sprintf(" AND users.country = '%s'", strings.ToUpper(country)) } query = fmt.Sprintf(lbUserQuery+"WHERE (users.privileges & 3) >= 3"+whereClause+order+" LIMIT %d, %d", m, p*l, l) } diff --git a/app/v1/manage_user.go b/app/v1/manage_user.go index 7fba294..d6de24b 100644 --- a/app/v1/manage_user.go +++ b/app/v1/manage_user.go @@ -8,8 +8,8 @@ import ( "strings" "time" - redis "gopkg.in/redis.v5" "github.com/RealistikOsu/RealistikAPI/common" + redis "gopkg.in/redis.v5" ) type setAllowedData struct { @@ -48,7 +48,7 @@ func UserManageSetAllowedPOST(md common.MethodData) common.CodeMessager { query := ` SELECT users.id, users.username, register_datetime, privileges, latest_activity, users_stats.username_aka, - users_stats.country + users.country FROM users LEFT JOIN users_stats ON users.id=users_stats.id diff --git a/app/v1/score.go b/app/v1/score.go index db13d4c..d317a3b 100644 --- a/app/v1/score.go +++ b/app/v1/score.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "gopkg.in/thehowl/go-osuapi.v1" "github.com/RealistikOsu/RealistikAPI/common" + "gopkg.in/thehowl/go-osuapi.v1" "zxq.co/x/getrank" ) @@ -78,8 +78,8 @@ func ScoresGET(md common.MethodData) common.CodeMessager { if where.Clause == "" && md.Query("id") == "" { return ErrMissingField("must specify at least one queried item") } - - rx_ap := common.Int(md.Query("rx")) + + rx_ap := common.Int(md.Query("rx")) //prob should be somewhere else but eh switch rx_ap { @@ -119,12 +119,11 @@ func ScoresGET(md common.MethodData) common.CodeMessager { genModeClause(md)+` `+sort+common.Paginate(md.Query("p"), md.Query("l"), 100), "FIF") } - where.Params = where.Params[:len(where.Params)-1] // this isnt python dash - // Query := "" - var Query string - if rx_ap == 1 { + // Query := "" + var Query string + if rx_ap == 1 { Query = ` SELECT scores_relax.id, scores_relax.beatmap_md5, scores_relax.score, @@ -135,12 +134,12 @@ func ScoresGET(md common.MethodData) common.CodeMessager { scores_relax.completed, users.id, users.username, users.register_datetime, users.privileges, - users.latest_activity, users_stats.username_aka, users_stats.country + users.latest_activity, users_stats.username_aka, users.country FROM scores_relax INNER JOIN users ON users.id = scores_relax.userid INNER JOIN users_stats ON users_stats.id = scores_relax.userid ` - } else if rx_ap == 2 { + } else if rx_ap == 2 { Query = ` SELECT scores_ap.id, scores_ap.beatmap_md5, scores_ap.score, @@ -151,13 +150,13 @@ func ScoresGET(md common.MethodData) common.CodeMessager { scores_ap.completed, users.id, users.username, users.register_datetime, users.privileges, - users.latest_activity, users_stats.username_aka, users_stats.country + users.latest_activity, users_stats.username_aka, users.country FROM scores_ap INNER JOIN users ON users.id = scores_ap.userid INNER JOIN users_stats ON users_stats.id = scores_ap.userid ` } else { - Query =` + Query = ` SELECT scores.id, scores.beatmap_md5, scores.score, scores.max_combo, scores.full_combo, scores.mods, @@ -167,13 +166,13 @@ SELECT scores.completed, users.id, users.username, users.register_datetime, users.privileges, - users.latest_activity, users_stats.username_aka, users_stats.country + users.latest_activity, users_stats.username_aka, users.country FROM scores INNER JOIN users ON users.id = scores.userid INNER JOIN users_stats ON users_stats.id = scores.userid ` - } - fmt.Println(Query) + } + fmt.Println(Query) rows, err := md.DB.Query(Query+where.Clause, where.Params...) if err != nil { md.Err(err) @@ -342,7 +341,7 @@ func genModeClauseColumn(md common.MethodData, column string) string { if md.Query("mode") != "" { m, err := strconv.Atoi(md.Query("mode")) if err == nil && m >= 0 && m <= 3 { - modeClause = fmt.Sprintf("AND " + column + " = '%d'", m) + modeClause = fmt.Sprintf("AND "+column+" = '%d'", m) } } return modeClause diff --git a/app/v1/user.go b/app/v1/user.go index 28ec076..c83dc59 100644 --- a/app/v1/user.go +++ b/app/v1/user.go @@ -7,9 +7,9 @@ import ( "strings" "unicode" + "github.com/RealistikOsu/RealistikAPI/common" "github.com/jmoiron/sqlx" "zxq.co/ripple/ocl" - "github.com/RealistikOsu/RealistikAPI/common" ) type userData struct { @@ -24,7 +24,7 @@ type userData struct { const userFields = `SELECT users.id, users.username, register_datetime, users.privileges, latest_activity, users_stats.username_aka, - users_stats.country + users.country FROM users INNER JOIN users_stats ON users.id=users_stats.id @@ -79,13 +79,13 @@ func userPutsMulti(md common.MethodData) common.CodeMessager { Where("users.privileges = ?", md.Query("privileges")). Where("users.privileges & ? > 0", md.Query("has_privileges")). Where("users.privileges & ? = 0", md.Query("has_not_privileges")). - Where("users_stats.country = ?", md.Query("country")). + Where("users.country = ?", md.Query("country")). Where("users_stats.username_aka = ?", md.Query("name_aka")). Where("privileges_groups.name = ?", md.Query("privilege_group")). In("users.id", pm("ids")...). In("users.username_safe", safeUsernameBulk(pm("names"))...). In("users_stats.username_aka", pm("names_aka")...). - In("users_stats.country", pm("countries")...) + In("users.country", pm("countries")...) var extraJoin string if md.Query("privilege_group") != "" { @@ -195,8 +195,8 @@ type userStats struct { } type generalStats struct { - Vanilla userStats `json:"vn"` - Relax userStats `json:"rx"` + Vanilla userStats `json:"vn"` + Relax userStats `json:"rx"` Autopilot userStats `json:"ap"` } @@ -219,38 +219,38 @@ type silenceInfo struct { End common.UnixTimestamp `json:"end"` } type userNotFullResponse struct { - Id int `json:"id"` - Username string `json:"username"` - UsernameAKA string `json:"username_aka"` - RegisteredOn common.UnixTimestamp `json:"registered_on"` - Privileges uint64 `json:"privileges"` - LatestActivity common.UnixTimestamp `json:"latest_activity"` - Country string `json:"country"` - UserColor string `json:"user_color"` - RankedScoreStd uint64 `json:"ranked_score_std"` - TotalScoreStd uint64 `json:"total_score_std"` - PlaycountStd int `json:"playcount_std"` - ReplaysWatchedStd int `json:"replays_watched_std"` - TotalHitsStd int `json:"total_hits_std"` - PpStd int `json:"pp_std"` - RankedScoreTaiko uint64 `json:"ranked_score_taiko"` - TotalScoreTaiko uint64 `json:"total_score_taiko"` - PlaycountTaiko int `json:"playcount_taiko"` - ReplaysWatchedTaiko int `json:"replays_watched_taiko"` - TotalHitsTaiko int `json:"total_hits_taiko"` - PpTaiko int `json:"pp_taiko"` - RankedScoreCtb uint64 `json:"ranked_score_ctb"` - TotalScoreCtb uint64 `json:"total_score_ctb"` - PlaycountCtb int `json:"playcount_ctb"` - ReplaysWatchedCtb int `json:"replays_watched_ctb"` - TotalHitsCtb int `json:"total_hits_ctb"` - PpCtb int `json:"pp_ctb"` - RankedScoreMania uint64 `json:"ranked_score_mania"` - TotalScoreMania uint64 `json:"total_score_mania"` - PlaycountMania int `json:"playcount_mania"` - ReplaysWatchedMania int `json:"replays_watched_mania"` - TotalHitsMania int `json:"total_hits_mania"` - PpMania int `json:"pp_mania"` + Id int `json:"id"` + Username string `json:"username"` + UsernameAKA string `json:"username_aka"` + RegisteredOn common.UnixTimestamp `json:"registered_on"` + Privileges uint64 `json:"privileges"` + LatestActivity common.UnixTimestamp `json:"latest_activity"` + Country string `json:"country"` + UserColor string `json:"user_color"` + RankedScoreStd uint64 `json:"ranked_score_std"` + TotalScoreStd uint64 `json:"total_score_std"` + PlaycountStd int `json:"playcount_std"` + ReplaysWatchedStd int `json:"replays_watched_std"` + TotalHitsStd int `json:"total_hits_std"` + PpStd int `json:"pp_std"` + RankedScoreTaiko uint64 `json:"ranked_score_taiko"` + TotalScoreTaiko uint64 `json:"total_score_taiko"` + PlaycountTaiko int `json:"playcount_taiko"` + ReplaysWatchedTaiko int `json:"replays_watched_taiko"` + TotalHitsTaiko int `json:"total_hits_taiko"` + PpTaiko int `json:"pp_taiko"` + RankedScoreCtb uint64 `json:"ranked_score_ctb"` + TotalScoreCtb uint64 `json:"total_score_ctb"` + PlaycountCtb int `json:"playcount_ctb"` + ReplaysWatchedCtb int `json:"replays_watched_ctb"` + TotalHitsCtb int `json:"total_hits_ctb"` + PpCtb int `json:"pp_ctb"` + RankedScoreMania uint64 `json:"ranked_score_mania"` + TotalScoreMania uint64 `json:"total_score_mania"` + PlaycountMania int `json:"playcount_mania"` + ReplaysWatchedMania int `json:"replays_watched_mania"` + TotalHitsMania int `json:"total_hits_mania"` + PpMania int `json:"pp_mania"` // STD clappedModeData `json:"std"` // Taiko clappedModeData `json:"taiko"` // CTB clappedModeData `json:"ctb"` @@ -268,7 +268,7 @@ func UserFullGET(md common.MethodData) common.CodeMessager { query := ` SELECT users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, - users_stats.username_aka, users_stats.country, users_stats.play_style, users_stats.favourite_mode, + users_stats.username_aka, users.country, users_stats.play_style, users_stats.favourite_mode, users_stats.custom_badge_icon, users_stats.custom_badge_name, users_stats.can_custom_badge, users_stats.show_custom_badge, @@ -371,7 +371,6 @@ LIMIT 1 &r.Stats.Relax.Mania.ReplaysWatched, &r.Stats.Relax.Mania.TotalHits, &r.Stats.Relax.Mania.Accuracy, &r.Stats.Relax.Mania.PP, &r.Stats.Relax.Mania.MaxCombo, - &r.Stats.Autopilot.STD.RankedScore, &r.Stats.Autopilot.STD.TotalScore, &r.Stats.Autopilot.STD.PlayCount, &r.Stats.Autopilot.STD.PlayTime, &r.Stats.Autopilot.STD.ReplaysWatched, &r.Stats.Autopilot.STD.TotalHits, &r.Stats.Autopilot.STD.Accuracy, &r.Stats.Autopilot.STD.PP, &r.Stats.Autopilot.STD.MaxCombo,