As per @lafriks and @guillep2k

Signed-off-by: Andrew Thornton <[email protected]>

models/avatar.go

@@ -14,20 +14,17 @@ import (
  "code.gitea.io/gitea/modules/setting"
 )
 
-var ()
-
 // EmailHash represents a pre-generated hash map
 type EmailHash struct {
- ID int64 `xorm:"pk autoincr"`
- Email string `xorm:"UNIQUE NOT NULL"`
- MD5Sum string `xorm:"md5_sum UNIQUE NOT NULL"`
+ Hash string `xorm:"pk hash UNIQUE NOT NULL"`
+ Email string `xorm:"UNIQUE NOT NULL"`
 }
 
 // GetEmailForHash converts a provided md5sum to the email
 func GetEmailForHash(md5Sum string) (string, error) {
  return cache.GetString("Avatar:"+md5Sum, func() (string, error) {
  emailHash := EmailHash{
- MD5Sum: strings.ToLower(strings.TrimSpace(md5Sum)),
+ Hash: strings.ToLower(strings.TrimSpace(md5Sum)),
  }
 
  _, err := x.Get(&emailHash)
@@ -41,8 +38,8 @@ func AvatarLink(email string) string {
  sum := fmt.Sprintf("%x", md5.Sum([]byte(lowerEmail)))
  _, _ = cache.GetString("Avatar:"+sum, func() (string, error) {
  emailHash := &EmailHash{
- Email:  lowerEmail,
- MD5Sum: sum,
+ Email: lowerEmail,
+ Hash:  sum,
  }
  _, _ = x.Insert(emailHash)
  return lowerEmail, nil

routers/routes/routes.go

@@ -417,7 +417,7 @@ func RegisterRoutes(m *macaron.Macaron) {
  })
  // ***** END: User *****
 
- m.Get("/avatar/:hash", user.AvatarByEmail)
+ m.Get("/avatar/:hash", user.AvatarByEmailHash)
 
  adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true})
 

routers/user/avatar.go

@@ -44,8 +44,8 @@ func Avatar(ctx *context.Context) {
  ctx.Redirect(user.RealSizedAvatarLink(size))
 }
 
-// AvatarByEmail redirects the browser to the appropriate Avatar link
-func AvatarByEmail(ctx *context.Context) {
+// AvatarByEmailHash redirects the browser to the appropriate Avatar link
+func AvatarByEmailHash(ctx *context.Context) {
  hash := ctx.Params(":hash")
  if len(hash) == 0 {
  ctx.ServerError("invalid avatar hash", errors.New("hash cannot be empty"))