refactor(db): migrate avatar methods off `user.go` (#7206)

2 files changed, 8 insertions, 11 deletions

diff --git a/internal/avatar/avatar.go b/internal/avatar/avatar.go
index a8c3826d..b66dfc21 100644
--- a/internal/avatar/avatar.go
+++ b/internal/avatar/avatar.go
@@ -14,11 +14,11 @@ import (
 	"github.com/issue9/identicon"
 )
 
-const AVATAR_SIZE = 290
+const DefaultSize = 290
 
-// RandomImage generates and returns a random avatar image unique to input data
-// in custom size (height and width).
-func RandomImageSize(size int, data []byte) (image.Image, error) {
+// RandomImageWithSize generates and returns a random avatar image unique to
+// input data in custom size (height and width).
+func RandomImageWithSize(size int, data []byte) (image.Image, error) {
 	randExtent := len(palette.WebSafe) - 32
 	rand.Seed(time.Now().UnixNano())
 	colorIndex := rand.Intn(randExtent)
@@ -37,7 +37,7 @@ func RandomImageSize(size int, data []byte) (image.Image, error) {
 }
 
 // RandomImage generates and returns a random avatar image unique to input data
-// in default size (height and width).
+// in DefaultSize (height and width).
 func RandomImage(data []byte) (image.Image, error) {
-	return RandomImageSize(AVATAR_SIZE, data)
+	return RandomImageWithSize(DefaultSize, data)
 }
diff --git a/internal/avatar/avatar_test.go b/internal/avatar/avatar_test.go
index 26e3fd9a..225ae68e 100644
--- a/internal/avatar/avatar_test.go
+++ b/internal/avatar/avatar_test.go
@@ -12,10 +12,7 @@ import (
 
 func Test_RandomImage(t *testing.T) {
 	_, err := RandomImage([]byte("gogs@local"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = RandomImageSize(0, []byte("gogs@local"))
+	assert.NoError(t, err)
+	_, err = RandomImageWithSize(0, []byte("gogs@local"))
 	assert.Error(t, err)
 }