From d958b9db4fa0f1910b3ca82338e3d68a70efedd9 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Thu, 26 Sep 2019 18:21:23 +0200
Subject: [PATCH] Alwaywas return local url for users avatar (#8245)

* Always return local url for users avatar

Avoids having to wait for DNS lookups when libravatar is activated
fixing #6046

* Avoid double slash in avatar link

* Move avatar route to the correct place
---
 models/action_test.go    |  2 +-
 models/user.go           | 16 ++++++++++++++--
 routers/routes/routes.go |  1 +
 routers/user/avatar.go   | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 routers/user/avatar.go

diff --git a/models/action_test.go b/models/action_test.go
index 16fdc7adcc..c90538ebe6 100644
--- a/models/action_test.go
+++ b/models/action_test.go
@@ -173,7 +173,7 @@ func TestPushCommits_AvatarLink(t *testing.T) {
 	pushCommits.Len = len(pushCommits.Commits)
 
 	assert.Equal(t,
-		"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon",
+		"/suburl/user/avatar/user2/-1",
 		pushCommits.AvatarLink("user2@example.com"))
 
 	assert.Equal(t,
diff --git a/models/user.go b/models/user.go
index e31f8b8534..030e23c383 100644
--- a/models/user.go
+++ b/models/user.go
@@ -17,6 +17,7 @@ import (
 	"image/png"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 	"unicode/utf8"
@@ -374,9 +375,20 @@ func (u *User) generateRandomAvatar(e Engine) error {
 	return nil
 }
 
-// SizedRelAvatarLink returns a relative link to the user's avatar. When
-// applicable, the link is for an avatar of the indicated size (in pixels).
+// SizedRelAvatarLink returns a link to the user's avatar via
+// the local explore page. Function returns immediately.
+// When applicable, the link is for an avatar of the indicated size (in pixels).
 func (u *User) SizedRelAvatarLink(size int) string {
+	return strings.TrimRight(setting.AppSubURL, "/") + "/user/avatar/" + u.Name + "/" + strconv.Itoa(size)
+}
+
+// RealSizedAvatarLink returns a link to the user's avatar. When
+// applicable, the link is for an avatar of the indicated size (in pixels).
+//
+// This function make take time to return when federated avatars
+// are in use, due to a DNS lookup need
+//
+func (u *User) RealSizedAvatarLink(size int) string {
 	if u.ID == -1 {
 		return base.DefaultAvatarLink()
 	}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index e18ac0923e..5262d4ad5c 100644
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -404,6 +404,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		// r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
 		m.Any("/activate", user.Activate, reqSignIn)
 		m.Any("/activate_email", user.ActivateEmail)
+		m.Get("/avatar/:username/:size", user.Avatar)
 		m.Get("/email2user", user.Email2User)
 		m.Get("/recover_account", user.ResetPasswd)
 		m.Post("/recover_account", user.ResetPasswdPost)
diff --git a/routers/user/avatar.go b/routers/user/avatar.go
new file mode 100644
index 0000000000..20597c72ff
--- /dev/null
+++ b/routers/user/avatar.go
@@ -0,0 +1,37 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package user
+
+import (
+	"strconv"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+)
+
+// Avatar redirect browser to user avatar of requested size
+func Avatar(ctx *context.Context) {
+	userName := ctx.Params(":username")
+	size, err := strconv.Atoi(ctx.Params(":size"))
+	if err != nil {
+		ctx.ServerError("Invalid avatar size", err)
+		return
+	}
+
+	log.Debug("Asked avatar for user %v and size %v", userName, size)
+
+	user, err := models.GetUserByName(userName)
+	if err != nil {
+		if models.IsErrUserNotExist(err) {
+			ctx.ServerError("Requested avatar for invalid user", err)
+		} else {
+			ctx.ServerError("Retrieving user by name", err)
+		}
+		return
+	}
+
+	ctx.Redirect(user.RealSizedAvatarLink(size))
+}