Merge branch 'master' of https://gitote.in/gitote/gitote

routes/user/certificate.go

@@ -2,14 +2,16 @@ package user
 
 import (
 	"gitote/gitote/pkg/context"
+	"strings"
 )
 
 const (
 	INTERNCERTIFICATE = "misc/internscert"
 )
 
-func InternCertificate(c *context.Context, puser *context.ParamsUser) {
-	c.Data["Owner"] = puser
+func InternCertificate(c *context.Context) {
+	ctxUser := GetUserByName(c, strings.TrimSuffix(c.Params(":username"), ""))
+	c.Data["Owner"] = ctxUser
 
 	c.HTML(200, INTERNCERTIFICATE)
 }

routes/user/embed.go

@@ -2,16 +2,16 @@ package user
 
 import (
 	"gitote/gitote/pkg/context"
+	"strings"
 )
 
 const (
 	EMBED = "embed/user"
 )
 
-func Embed(c *context.Context, puser *context.ParamsUser) {
-	c.Title(puser.DisplayName())
-	c.PageIs("PageIsUserProfile")
-	c.Data["Owner"] = puser
+func Embed(c *context.Context) {
+	ctxUser := GetUserByName(c, strings.TrimSuffix(c.Params(":username"), ""))
+	c.Data["Owner"] = ctxUser
 
 	c.HTML(200, EMBED)
 }

routes/user/profile.go

@@ -18,6 +18,15 @@ const (
 	STARS     = "user/meta/stars"
 )
 
+func GetUserByName(c *context.Context, name string) *models.User {
+	user, err := models.GetUserByName(name)
+	if err != nil {
+		c.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
+		return nil
+	}
+	return user
+}
+
 func Profile(c *context.Context, puser *context.ParamsUser) {
 	isShowKeys := false
 	if strings.HasSuffix(c.Params(":username"), ".keys") {