Use identicon image for default gravatar. (#2767)

harryxu · appleboy · commit 81d1e54a49cc · 2017-10-23T03:50:07.000-05:00
* Use identicon image for default gravatar.

* Fixed tests.
diff --git a/models/action_test.go b/models/action_test.go
@@ -146,11 +146,11 @@ func TestPushCommits_AvatarLink(t *testing.T) {
 	pushCommits.Len = len(pushCommits.Commits)
 
 	assert.Equal(t,
-		"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f",
+		"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon",
 		pushCommits.AvatarLink("user2@example.com"))
 
 	assert.Equal(t,
-		"https://secure.gravatar.com/avatar/19ade630b94e1e0535b3df7387434154",
+		"https://secure.gravatar.com/avatar/19ade630b94e1e0535b3df7387434154?d=identicon",
 		pushCommits.AvatarLink("nonexistent@example.com"))
 }
 
diff --git a/modules/base/tool.go b/modules/base/tool.go
@@ -211,7 +211,7 @@ func AvatarLink(email string) string {
 	}
 
 	if !setting.DisableGravatar {
-		return setting.GravatarSource + HashEmail(email)
+		return setting.GravatarSource + HashEmail(email) + "?d=identicon"
 	}
 
 	return DefaultAvatarLink()
diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go
@@ -135,7 +135,7 @@ func TestAvatarLink(t *testing.T) {
 
 	setting.DisableGravatar = false
 	assert.Equal(t,
-		"353cbad9b58e69c96154ad99f92bedc7",
+		"353cbad9b58e69c96154ad99f92bedc7?d=identicon",
 		AvatarLink("gitea@example.com"),
 	)
 }

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func AvatarLink(email string) string {`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`if !setting.DisableGravatar {`
`214`		`- return setting.GravatarSource + HashEmail(email)`
	`214`	`+ return setting.GravatarSource + HashEmail(email) + "?d=identicon"`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`return DefaultAvatarLink()`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func TestAvatarLink(t *testing.T) {`
`135`	`135`
`136`	`136`	`setting.DisableGravatar = false`
`137`	`137`	`assert.Equal(t,`
`138`		`- "353cbad9b58e69c96154ad99f92bedc7",`
	`138`	`+ "353cbad9b58e69c96154ad99f92bedc7?d=identicon",`
`139`	`139`	`AvatarLink("[email protected]"),`
`140`	`140`	`)`
`141`	`141`	`}`