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

peppyapi: replicate behaviour of original API (check for user ID first, then for username)

Browse Source
This commit is contained in:
Howl 2016-05-18 17:47:39 +02:00
parent 5320c62e17
commit 2afc557ef8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/peppy/common.go
View File

@ -26,7 +26,7 @@ func genUser(c *gin.Context, db *sql.DB) (string, string) {
var p string var p string
// used in second case of switch // used in second case of switch
_, err := strconv.Atoi(c.Query("u")) s, err := strconv.Atoi(c.Query("u"))
switch { switch {
// We know for sure that it's an username. // We know for sure that it's an username.
@ -35,14 +35,15 @@ func genUser(c *gin.Context, db *sql.DB) (string, string) {
p = c.Query("u") p = c.Query("u")
// It could be an user ID, so we look for an user with that username first. // It could be an user ID, so we look for an user with that username first.
case err == nil: case err == nil:
err = db.QueryRow("SELECT id FROM users WHERE username = ? LIMIT 1", c.Query("u")).Scan(&p) err = db.QueryRow("SELECT id FROM users WHERE id = ? LIMIT 1", s).Scan(&p)
// If there is an error, that means u is an userID.
// If there is none, p will automatically have become the user id retrieved from the database
// in the last query.
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
// If no user with that userID were found, assume username.
p = c.Query("u") p = c.Query("u")
} whereClause = "WHERE users.username = ?"
} else {
// An user with that userID was found. Thus it's an userID.
whereClause = "WHERE users.id = ?" whereClause = "WHERE users.id = ?"
}
// u contains letters, so it's an username. // u contains letters, so it's an username.
default: default:
p = c.Query("u") p = c.Query("u")