From 4448fcdfdb1ad7e83de062f878ebe2d5c63040b5 Mon Sep 17 00:00:00 2001
From: Howl <the@howl.moe>
Date: Sat, 14 May 2016 20:55:42 +0200
Subject: [PATCH] Update /users/userpage to use querystring parameters

---
 app/start.go   |  2 +-
 app/v1/user.go | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/start.go b/app/start.go
index d857367..79c4461 100644
--- a/app/start.go
+++ b/app/start.go
@@ -31,7 +31,7 @@ func Start(conf common.Conf, db *sql.DB) *gin.Engine {
 			gv1.GET("/users/self", Method(v1.UserSelfGET, db, common.PrivilegeRead))
 			gv1.GET("/users/whatid", Method(v1.UserWhatsTheIDGET, db, common.PrivilegeRead))
 			gv1.GET("/users/full", Method(v1.UserFullGET, db, common.PrivilegeRead))
-			gv1.GET("/users/userpage/:id", Method(v1.UserUserpageGET, db, common.PrivilegeRead))
+			gv1.GET("/users/userpage", Method(v1.UserUserpageGET, db, common.PrivilegeRead))
 			gv1.GET("/badges", Method(v1.BadgesGET, db, common.PrivilegeRead))
 			gv1.GET("/badges/:id", Method(v1.BadgeByIDGET, db, common.PrivilegeRead))
 
diff --git a/app/v1/user.go b/app/v1/user.go
index c0d53c0..2d27413 100644
--- a/app/v1/user.go
+++ b/app/v1/user.go
@@ -23,7 +23,7 @@ type userData struct {
 
 // UsersGET is the API handler for GET /users
 func UsersGET(md common.MethodData) common.CodeMessager {
-	shouldRet, whereClause, param := whereClauseUser(md)
+	shouldRet, whereClause, param := whereClauseUser(md, "users")
 	if shouldRet != nil {
 		return *shouldRet
 	}
@@ -141,7 +141,7 @@ type userFullResponse struct {
 
 // UserFullGET gets all of an user's information, with one exception: their userpage.
 func UserFullGET(md common.MethodData) common.CodeMessager {
-	shouldRet, whereClause, param := whereClauseUser(md)
+	shouldRet, whereClause, param := whereClauseUser(md, "users")
 	if shouldRet != nil {
 		return *shouldRet
 	}
@@ -240,11 +240,15 @@ type userpageResponse struct {
 
 // UserUserpageGET gets an user's userpage, as in the customisable thing.
 func UserUserpageGET(md common.MethodData) common.CodeMessager {
+	shouldRet, whereClause, param := whereClauseUser(md, "users_stats")
+	if shouldRet != nil {
+		return *shouldRet
+	}
 	var r userpageResponse
-	err := md.DB.QueryRow("SELECT userpage_content FROM users_stats WHERE id = ? LIMIT 1", md.C.Param("id")).Scan(&r.Userpage)
+	err := md.DB.QueryRow("SELECT userpage_content FROM users_stats WHERE "+whereClause+" LIMIT 1", param).Scan(&r.Userpage)
 	switch {
 	case err == sql.ErrNoRows:
-		return common.SimpleResponse(404, "No user with that user ID!")
+		return common.SimpleResponse(404, "No such user!")
 	case err != nil:
 		md.Err(err)
 		return Err500
@@ -253,19 +257,19 @@ func UserUserpageGET(md common.MethodData) common.CodeMessager {
 	return r
 }
 
-func whereClauseUser(md common.MethodData) (*common.CodeMessager, string, interface{}) {
+func whereClauseUser(md common.MethodData, tableName string) (*common.CodeMessager, string, interface{}) {
 	switch {
 	case md.C.Query("id") == "self":
-		return nil, "users.id = ?", md.ID()
+		return nil, tableName + ".id = ?", md.ID()
 	case md.C.Query("id") != "":
 		id, err := strconv.Atoi(md.C.Query("id"))
 		if err != nil {
 			a := common.SimpleResponse(400, "please pass a valid user ID")
 			return &a, "", nil
 		}
-		return nil, "users.id = ?", id
+		return nil, tableName + ".id = ?", id
 	case md.C.Query("name") != "":
-		return nil, "users.username = ?", md.C.Query("name")
+		return nil, tableName + ".username = ?", md.C.Query("name")
 	}
 	a := common.SimpleResponse(400, "you need to pass either querystring parameters name or id")
 	return &a, "", nil