Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: letter avatar is generating wrong letters for names with non-alpha chars (#412)

Guilherme Oenningd9f612d8cf95
diff --git a/Gopkg.lock b/Gopkg.lock
index 2d40c3570..05e3aec17 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -17,7 +17,7 @@
branch = "master"
name = "github.com/goenning/letteravatar"
packages = ["."]
- revision = "2e66c7ba1cecb2fa416c0e9ba5f653865ec32efd"
+ revision = "553181ed4055278e356ce21812adb34ae487f88e"
[[projects]]
branch = "master"
@@ -93,7 +93,9 @@
branch = "master"
name = "golang.org/x/image"
packages = [
+ "draw",
"font",
+ "math/f64",
"math/fixed"
]
revision = "e20db36d77bd0cb36cea8fe49d5c37d82d21591f"
@@ -141,6 +143,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
- inputs-digest = "be567a190b4ce44785a0c4d0c9603f516899871239d10f33e55d1e11213ce46b"
+ inputs-digest = "fe191ecdac4785a24586c7888998a42fc460ba4753eba2480190042d6cf3014d"
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/vendor/github.com/goenning/letteravatar/draw.go b/vendor/github.com/goenning/letteravatar/draw.go
index 4af5ee898..69e686263 100644
--- a/vendor/github.com/goenning/letteravatar/draw.go
+++ b/vendor/github.com/goenning/letteravatar/draw.go
@@ -44,15 +44,26 @@ func Extract(name string) string {
}
if len(slices) >= 2 {
- return strings.ToUpper(first(slices[0]) + first(slices[len(slices)-1]))
+ firstletter := first(slices[0])
+ secondLetter := ""
+ for i := len(slices) - 1; i > 0; i-- {
+ secondLetter = first(slices[i])
+ if secondLetter != "" {
+ break
+ }
+ }
+ return strings.ToUpper(firstletter + secondLetter)
}
return strings.ToUpper(first(name))
}
func first(s string) string {
- firstLetter, _ := utf8.DecodeRuneInString(s)
- return string(firstLetter)
+ firstRune, _ := utf8.DecodeRuneInString(s)
+ if unicode.IsLetter(firstRune) || unicode.IsNumber(firstRune) {
+ return string(firstRune)
+ }
+ return ""
}
func splitBySpace(src string) (entries []string) {
diff --git a/vendor/github.com/goenning/letteravatar/draw_test.go b/vendor/github.com/goenning/letteravatar/draw_test.go
index db93b0ef3..f2c9fa5b7 100644
--- a/vendor/github.com/goenning/letteravatar/draw_test.go
+++ b/vendor/github.com/goenning/letteravatar/draw_test.go
@@ -55,6 +55,14 @@ func TestExtract(t *testing.T) {
input: "AryaStark",
expected: "AS",
},
+ {
+ input: "Jon (Snow)",
+ expected: "J",
+ },
+ {
+ input: "Jon Wallet (JS)",
+ expected: "JW",
+ },
}
for _, testCase := range testCases {