Explorar o código

fix cannot show user public ssh keys

Unknwon %!s(int64=9) %!d(string=hai) anos
pai
achega
62edc5c59a
Modificáronse 1 ficheiros con 8 adicións e 4 borrados
  1. 8 4
      routers/user/profile.go

+ 8 - 4
routers/user/profile.go

@@ -21,9 +21,8 @@ const (
 	STARS     base.TplName = "user/meta/stars"
 )
 
-// GetUserByParams returns user whose name is presented in URL paramenter.
-func GetUserByParams(ctx *middleware.Context) *models.User {
-	user, err := models.GetUserByName(ctx.Params(":username"))
+func GetUserByName(ctx *middleware.Context, name string) *models.User {
+	user, err := models.GetUserByName(name)
 	if err != nil {
 		if models.IsErrUserNotExist(err) {
 			ctx.Error(404)
@@ -35,6 +34,11 @@ func GetUserByParams(ctx *middleware.Context) *models.User {
 	return user
 }
 
+// GetUserByParams returns user whose name is presented in URL paramenter.
+func GetUserByParams(ctx *middleware.Context) *models.User {
+	return GetUserByName(ctx, ctx.Params(":username"))
+}
+
 func Profile(ctx *middleware.Context) {
 	uname := ctx.Params(":username")
 	// Special handle for FireFox requests favicon.ico.
@@ -51,7 +55,7 @@ func Profile(ctx *middleware.Context) {
 		isShowKeys = true
 	}
 
-	u := GetUserByParams(ctx)
+	u := GetUserByName(ctx, strings.TrimSuffix(uname, ".keys"))
 	if ctx.Written() {
 		return
 	}