Skip to content

Commit 282d782

Browse files
committed
fix 500 error for ghost avatar
1 parent c0bb5eb commit 282d782

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

routers/user/avatar.go

+13-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package user
66

77
import (
88
"strconv"
9+
"strings"
910

1011
"code.gitea.io/gitea/models"
1112
"code.gitea.io/gitea/modules/context"
@@ -23,14 +24,19 @@ func Avatar(ctx *context.Context) {
2324

2425
log.Debug("Asked avatar for user %v and size %v", userName, size)
2526

26-
user, err := models.GetUserByName(userName)
27-
if err != nil {
28-
if models.IsErrUserNotExist(err) {
29-
ctx.ServerError("Requested avatar for invalid user", err)
30-
} else {
31-
ctx.ServerError("Retrieving user by name", err)
27+
var user *models.User
28+
if strings.ToLower(userName) != "ghost" {
29+
user, err = models.GetUserByName(userName)
30+
if err != nil {
31+
if models.IsErrUserNotExist(err) {
32+
ctx.ServerError("Requested avatar for invalid user", err)
33+
} else {
34+
ctx.ServerError("Retrieving user by name", err)
35+
}
36+
return
3237
}
33-
return
38+
} else {
39+
user = models.NewGhostUser()
3440
}
3541

3642
ctx.Redirect(user.RealSizedAvatarLink(size))

0 commit comments

Comments
 (0)