Add Arabic Support to Avatar Generator

app/handlers/images.go

@@ -6,14 +6,13 @@ import (
 	"image/color"
 	"image/png"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 	"time"
-
 	"github.com/getfider/fider/app/models/cmd"
 	"github.com/getfider/fider/app/models/dto"
 	"github.com/getfider/fider/app/models/query"
-
 	"github.com/getfider/fider/app/pkg/bus"
 	"github.com/getfider/fider/app/pkg/crypto"
 	"github.com/getfider/fider/app/pkg/env"
@@ -32,14 +31,20 @@ func LetterAvatar() web.HandlerFunc {
 			name = "?"
 		}
 
+		// URL decode the name
+		decodedName, err := url.QueryUnescape(name)
+		if err != nil {
+			return c.Failure(err)
+		}
+
 		size, err := c.QueryParamAsInt("size")
 		if err != nil {
 			return c.BadRequest(web.Map{})
 		}
 		size = between(size, 50, 200)
 
-		img, err := letteravatar.Draw(size, letteravatar.Extract(name), &letteravatar.Options{
-			PaletteKey: fmt.Sprintf("%s:%s", id, name),
+		img, err := letteravatar.Draw(size, letteravatar.Extract(decodedName), &letteravatar.Options{
+			PaletteKey: fmt.Sprintf("%s:%s", id, decodedName),
 		})
 		if err != nil {
 			return c.Failure(err)

app/pkg/letteravatar/letteravatar.go

@@ -7,6 +7,7 @@ import (
 	"image/draw"
 	"math"
 	"strings"
+	"unicode/utf8"
 
 	"github.com/golang/freetype"
 	"github.com/golang/freetype/truetype"
@@ -32,13 +33,13 @@ func Extract(name string) string {
 		return "?"
 	}
 
-	firstWord := []rune(words[0])
-	if len(firstWord) == 0 {
+	// Get first rune from first word
+	r, _ := utf8.DecodeRuneInString(words[0])
+	if r == utf8.RuneError {
 		return "?"
 	}
 
-	firstLetter := string(firstWord[0])
-	return firstLetter
+	return string(r)
 }
 
 // Draw generates a letter avatar image with the given size and text