make avatar lookup occur at image request

modules/base/tool.go

@@ -211,7 +211,7 @@ func SizedAvatarLink(email string, size int) string {
 // which includes app sub-url as prefix. However, it is possible
 // to return full URL if user enables Gravatar-like service.
 func AvatarLink(email string) string {
- return SizedAvatarLink(email, DefaultAvatarSize)
+ return setting.AppSubURL + "/avatar/" + base64.RawURLEncoding.EncodeToString([]byte(email))
 }
 
 // FileSize calculates the file size and generate user-friendly string.

modules/base/tool_test.go

@@ -1,6 +1,7 @@
 package base
 
 import (
+ "encoding/base64"
  "net/url"
  "testing"
 
@@ -92,11 +93,11 @@ func TestSizedAvatarLink(t *testing.T) {
 
 func TestAvatarLink(t *testing.T) {
  disableGravatar()
- assert.Equal(t, "/img/avatar_default.png", AvatarLink("[email protected]"))
+ assert.Equal(t, "/avatar/"+base64.RawURLEncoding.EncodeToString([]byte("[email protected]")), AvatarLink("[email protected]"))
 
  enableGravatar(t)
  assert.Equal(t,
- "https://secure.gravatar.com/avatar/353cbad9b58e69c96154ad99f92bedc7?d=identicon",
+ "/avatar/"+base64.RawURLEncoding.EncodeToString([]byte("gitea@example.com")),
  AvatarLink("[email protected]"),
  )
 }

modules/repository/commits_test.go

@@ -6,6 +6,7 @@ package repository
 
 import (
  "container/list"
+ "encoding/base64"
  "testing"
  "time"
 
@@ -114,7 +115,7 @@ func TestPushCommits_AvatarLink(t *testing.T) {
  pushCommits.AvatarLink("[email protected]"))
 
  assert.Equal(t,
- "https://secure.gravatar.com/avatar/19ade630b94e1e0535b3df7387434154?d=identicon",
+ "/avatar/"+base64.RawURLEncoding.EncodeToString([]byte("nonexistent@example.com")),
  pushCommits.AvatarLink("[email protected]"))
 }
 

routers/routes/routes.go

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

routers/user/avatar.go

@@ -5,10 +5,13 @@
 package user
 
 import (
+ "encoding/base64"
+ "errors"
  "strconv"
  "strings"
 
  "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/base"
  "code.gitea.io/gitea/modules/context"
  "code.gitea.io/gitea/modules/log"
 )
@@ -41,3 +44,23 @@ func Avatar(ctx *context.Context) {
 
  ctx.Redirect(user.RealSizedAvatarLink(size))
 }
+
+// AvatarByEmail redirects the browser to the appropriate Avatar link
+func AvatarByEmail(ctx *context.Context) {
+ email := ctx.Params(":email")
+ addr, err := base64.RawURLEncoding.DecodeString(email)
+ email = string(addr)
+ if err != nil {
+ ctx.ServerError("invalid email address", err)
+ return
+ } else if email == "" {
+ ctx.ServerError("invalid email address", errors.New("email cannot be empty"))
+ return
+ }
+ size := ctx.QueryInt("size")
+ if size == 0 {
+ size = base.DefaultAvatarSize
+ }
+
+ ctx.Redirect(base.SizedAvatarLink(email, size))
+}