changed Params to UserName to Username

mattermost · Feb 7, 2017 · 679cb10 · 679cb10
1 parent 20e43a2
commit 679cb10
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/api4/context.go b/api4/context.go
@@ -359,16 +359,16 @@ func (c *Context) RequireChannelId() *Context {
 	return c
 }
 
-func (c *Context) RequireUserName() *Context {
+func (c *Context) RequireUsername() *Context {
 	if c.Err != nil {
 		return c
 	}
 
-	if len(c.Params.UserName) < 3 {
+	if len(c.Params.Username) < 3 {
 		c.SetInvalidUrlParam("username")
 	} 
 
-	if len(c.Params.UserName) > 22 {
+	if len(c.Params.Username) > 22 {
 		c.SetInvalidUrlParam("username")
 	}
 

diff --git a/api4/params.go b/api4/params.go
@@ -25,7 +25,7 @@ type ApiParams struct {
 	CommandId string
 	HookId    string
 	EmojiId   string
-	UserName  string
+	Username  string
 	Page      int
 	PerPage   int
 }
@@ -68,7 +68,7 @@ func ApiParamsFromRequest(r *http.Request) *ApiParams {
 	}
 
 	if val, ok := props["username"]; ok {
-		params.UserName = val
+		params.Username = val
 	}
 
 	if val, err := strconv.Atoi(r.URL.Query().Get("page")); err != nil {

diff --git a/api4/user.go b/api4/user.go
@@ -90,7 +90,7 @@ func getUser(c *Context, w http.ResponseWriter, r *http.Request) {
 }
 
 func getUserByUsername(c *Context, w http.ResponseWriter, r *http.Request) {
-	c.RequireUserName()
+	c.RequireUsername()
 	if c.Err != nil {
 		return
 	}
@@ -100,7 +100,7 @@ func getUserByUsername(c *Context, w http.ResponseWriter, r *http.Request) {
 	var user *model.User
 	var err *model.AppError
 
-	if user, err = app.GetUserByUsername(c.Params.UserName); err != nil {
+	if user, err = app.GetUserByUsername(c.Params.Username); err != nil {
 		c.Err = err
 		return
 	}