Skip to content

Commit 02ced72

Browse files
True vibing consequences (#87)
* add userid param to getEligibleTitles * add userid to le call * userid param * Update leaderboard.go * deploy * Update .github/workflows/production-deploy.yml
1 parent 77e72e9 commit 02ced72

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

app/v1/clan.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ func ClanMembersGET(md common.MethodData) common.CodeMessager {
613613
}
614614

615615
var eligibleTitles []eligibleTitle
616-
eligibleTitles, err = getEligibleTitles(md, userDB.Privileges)
616+
eligibleTitles, err = getEligibleTitles(md, userDB.ID, userDB.Privileges)
617617
if err != nil {
618618
md.Err(err)
619619
return Err500

app/v1/leaderboard.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func getLbUsersDb(p int, l int, rx int, modeInt int, sort string, md common.Meth
9090
chosenMode.Level = ocl.GetLevelPrecise(int64(chosenMode.TotalScore))
9191

9292
var eligibleTitles []eligibleTitle
93-
eligibleTitles, err = getEligibleTitles(md, userDB.Privileges)
93+
eligibleTitles, err = getEligibleTitles(md, userDB.ID, userDB.Privileges)
9494
if err != nil {
9595
md.Err(err)
9696
return make([]leaderboardUser, 0)
@@ -178,7 +178,7 @@ func LeaderboardGET(md common.MethodData) common.CodeMessager {
178178
chosenMode.Level = ocl.GetLevelPrecise(int64(chosenMode.TotalScore))
179179

180180
var eligibleTitles []eligibleTitle
181-
eligibleTitles, err = getEligibleTitles(md, userDB.Privileges)
181+
eligibleTitles, err = getEligibleTitles(md, userDB.ID, userDB.Privileges)
182182
if err != nil {
183183
md.Err(err)
184184
return Err500

app/v1/self.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func UsersSelfSettingsPOST(md common.MethodData) common.CodeMessager {
8787
return Err500
8888
}
8989

90-
eligibleTitles, err := getEligibleTitles(md, privileges)
90+
eligibleTitles, err := getEligibleTitles(md, md.ID(), privileges)
9191
if err != nil {
9292
md.Err(err)
9393
return Err500
@@ -154,14 +154,14 @@ type userSettingsResponse struct {
154154
// - Privilege-based titles: Check if user has specific privilege combinations
155155
// - Badge-based titles: Check if user has specific badges by ID
156156
// - Titles are returned in a specific priority order (to accomodate default title selection)
157-
func getEligibleTitles(md common.MethodData, privileges uint64) ([]eligibleTitle, error) {
157+
func getEligibleTitles(md common.MethodData, userID int, privileges uint64) ([]eligibleTitle, error) {
158158
titles := make([]eligibleTitle, 0)
159159

160160
userPrivs := common.UserPrivileges(privileges)
161161

162162
// Check badges first (they have higher priority)
163163
rows, err := md.DB.Query("SELECT b.id FROM user_badges ub "+
164-
"INNER JOIN badges b ON ub.badge = b.id WHERE user = ?", md.ID())
164+
"INNER JOIN badges b ON ub.badge = b.id WHERE user = ?", userID)
165165
if err != nil {
166166
return nil, err
167167
}
@@ -313,7 +313,7 @@ WHERE id = ?`, md.ID()).Scan(
313313
}{}
314314
}
315315

316-
eligibleTitles, err := getEligibleTitles(md, privileges)
316+
eligibleTitles, err := getEligibleTitles(md, r.ID, privileges)
317317
if err != nil {
318318
md.Err(err)
319319
return Err500

app/v1/user.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func userPutsSingle(md common.MethodData, row *sqlx.Row) common.CodeMessager {
108108
}
109109

110110
var eligibleTitles []eligibleTitle
111-
eligibleTitles, err = getEligibleTitles(md, userDataDB.Privileges)
111+
eligibleTitles, err = getEligibleTitles(md, userDataDB.ID, userDataDB.Privileges)
112112
if err != nil {
113113
md.Err(err)
114114
return Err500
@@ -179,7 +179,7 @@ func userPutsMulti(md common.MethodData) common.CodeMessager {
179179
}
180180

181181
var eligibleTitles []eligibleTitle
182-
eligibleTitles, err = getEligibleTitles(md, userDB.Privileges)
182+
eligibleTitles, err = getEligibleTitles(md, userDB.ID, userDB.Privileges)
183183
if err != nil {
184184
md.Err(err)
185185
return Err500
@@ -322,7 +322,7 @@ func UserFullGET(md common.MethodData) common.CodeMessager {
322322
return Err500
323323
}
324324

325-
eligibleTitles, err := getEligibleTitles(md, userDB.Privileges)
325+
eligibleTitles, err := getEligibleTitles(md, userDB.ID, userDB.Privileges)
326326
if err != nil {
327327
md.Err(err)
328328
return Err500

0 commit comments

Comments
 (0)