EZPPFarm/ripple-api
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use new badge system, users/full now returns badge information rather than just the ID

Browse Source
This commit is contained in:
Howl 2016-09-01 22:50:56 +02:00
parent 76c653b47e
commit 12aaa04fea
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/v1/user.go
View File

@ -63,20 +63,6 @@ func userPuts(md common.MethodData, row *sqlx.Row) common.CodeMessager {
return user return user
} }
func badgesToArray(badges string) []int {
var end []int
badgesSl := strings.Split(badges, ",")
for _, badge := range badgesSl {
if badge != "" && badge != "0" {
nb := common.Int(badge)
if nb != 0 {
end = append(end, nb)
}
}
}
return end
}
// UserSelfGET is a shortcut for /users/id/self. (/users/self) // UserSelfGET is a shortcut for /users/id/self. (/users/self)
func UserSelfGET(md common.MethodData) common.CodeMessager { func UserSelfGET(md common.MethodData) common.CodeMessager {
md.C.Request.URL.RawQuery = "id=self&" + md.C.Request.URL.RawQuery md.C.Request.URL.RawQuery = "id=self&" + md.C.Request.URL.RawQuery
@ -123,7 +109,7 @@ type userFullResponse struct {
Mania modeData `json:"mania"` Mania modeData `json:"mania"`
PlayStyle int `json:"play_style"` PlayStyle int `json:"play_style"`
FavouriteMode int `json:"favourite_mode"` FavouriteMode int `json:"favourite_mode"`
Badges []int `json:"badges"` Badges []singleBadge `json:"badges"`
} }
// UserFullGET gets all of an user's information, with one exception: their userpage. // UserFullGET gets all of an user's information, with one exception: their userpage.
@ -138,8 +124,7 @@ func UserFullGET(md common.MethodData) common.CodeMessager {
SELECT SELECT
users.id, users.username, users.register_datetime, users.privileges, users.latest_activity, users.id, users.username, users.register_datetime, users.privileges, users.latest_activity,
users_stats.username_aka, users_stats.badges_shown, users_stats.country, users_stats.username_aka, users_stats.country, users_stats.play_style, users_stats.favourite_mode,
users_stats.play_style, users_stats.favourite_mode,
users_stats.ranked_score_std, users_stats.total_score_std, users_stats.playcount_std, users_stats.ranked_score_std, users_stats.total_score_std, users_stats.playcount_std,
users_stats.replays_watched_std, users_stats.total_hits_std, users_stats.replays_watched_std, users_stats.total_hits_std,
@ -173,13 +158,10 @@ LIMIT 1
` `
// Fuck. // Fuck.
r := userFullResponse{} r := userFullResponse{}
var (
badges string
)
err := md.DB.QueryRow(query, param).Scan( err := md.DB.QueryRow(query, param).Scan(
&r.ID, &r.Username, &r.RegisteredOn, &r.Privileges, &r.LatestActivity, &r.ID, &r.Username, &r.RegisteredOn, &r.Privileges, &r.LatestActivity,
&r.UsernameAKA, &badges, &r.Country, &r.UsernameAKA, &r.Country,
&r.PlayStyle, &r.FavouriteMode, &r.PlayStyle, &r.FavouriteMode,
&r.STD.RankedScore, &r.STD.TotalScore, &r.STD.PlayCount, &r.STD.RankedScore, &r.STD.TotalScore, &r.STD.PlayCount,
@ -206,12 +188,26 @@ LIMIT 1
return Err500 return Err500
} }
r.Badges = badgesToArray(badges)
for _, m := range []*modeData{&r.STD, &r.Taiko, &r.CTB, &r.Mania} { for _, m := range []*modeData{&r.STD, &r.Taiko, &r.CTB, &r.Mania} {
m.Level = ocl.GetLevelPrecise(int64(m.TotalScore)) m.Level = ocl.GetLevelPrecise(int64(m.TotalScore))
} }
rows, err := md.DB.Query("SELECT b.id, b.name, b.icon FROM user_badges ub "+
"LEFT JOIN badges b ON ub.badge = b.id WHERE user = ?", r.ID)
if err != nil {
md.Err(err)
}
for rows.Next() {
var badge singleBadge
err := rows.Scan(&badge.ID, &badge.Name, &badge.Icon)
if err != nil {
md.Err(err)
continue
}
r.Badges = append(r.Badges, badge)
}
r.Code = 200 r.Code = 200
return r return r
} }