fix lint

go-gitea · Jul 20, 2022 · 0a0b147 · 0a0b147
1 parent f09578d
commit 0a0b147
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go
@@ -14,7 +14,7 @@ import (
 	_ "image/jpeg" // for processing jpeg images
 	_ "image/png"  // for processing png images
 
-	"code.gitea.io/gitea/modules/avatar/dice_bear"
+	"code.gitea.io/gitea/modules/avatar/dicebear"
 	"code.gitea.io/gitea/modules/avatar/identicon"
 	"code.gitea.io/gitea/modules/avatar/none"
 	"code.gitea.io/gitea/modules/avatar/robot"
@@ -63,7 +63,7 @@ var (
 	orgImageGenerator  randomOrgImageGenerator  = identicon.Identicon{}
 	repoImageGenerator randomRepoImageGenerator = identicon.Identicon{}
 	generators                                  = []randomImageGenerator{
-		dice_bear.DiceBear{},
+		dicebear.DiceBear{},
 		identicon.Identicon{},
 		none.None{},
 		robot.Robot{},

diff --git a/modules/avatar/dice_bear/generate.go → modules/avatar/dicebear/generate.go b/modules/avatar/dice_bear/generate.go → modules/avatar/dicebear/generate.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package dice_bear
+package dicebear
 
 import (
 	"fmt"
@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"codeberg.org/Codeberg/avatars"
-
 	"github.com/fogleman/gg"
 	"github.com/lafriks/go-svg"
 	"github.com/lafriks/go-svg/renderer"
@@ -21,16 +20,16 @@ import (
 // DiceBear is used to generate pseudo-random avatars
 type DiceBear struct{}
 
-func (_ DiceBear) Name() string {
+func (DiceBear) Name() string {
 	return "dicebear"
 }
 
-func (_ DiceBear) RandomUserImage(size int, data []byte) (image.Image, error) {
+func (DiceBear) RandomUserImage(size int, data []byte) (image.Image, error) {
 	return randomImageSize(size, data)
 }
 
-func (_ DiceBear) RandomOrgImage(size int, data []byte) (image.Image, error) {
-	size = size / 2
+func (DiceBear) RandomOrgImage(size int, data []byte) (image.Image, error) {
+	size /= 2
 	space := size / 20
 	img := image.NewRGBA(image.Rect(0, 0, size*2, size*2))
 
@@ -39,7 +38,7 @@ func (_ DiceBear) RandomOrgImage(size int, data []byte) (image.Image, error) {
 		if err != nil {
 			return nil, err
 		}
-		pos := image.Rect((i-int(i/2)*2)*(size+space), int(i/2)*(size+space), ((i-int(i/2)*2)+1)*(size+space), (int(i/2)+1)*(size+space))
+		pos := image.Rect((i-(i/2)*2)*(size+space), (i/2)*(size+space), ((i-(i/2)*2)+1)*(size+space), ((i/2)+1)*(size+space))
 		draw.Draw(img, pos, av, image.Point{}, draw.Over)
 	}
 

diff --git a/modules/avatar/identicon/generate.go b/modules/avatar/identicon/generate.go
@@ -13,19 +13,19 @@ import (
 // Identicon is used to generate pseudo-random avatars
 type Identicon struct{}
 
-func (_ Identicon) Name() string {
+func (Identicon) Name() string {
 	return "identicon"
 }
 
-func (_ Identicon) RandomUserImage(size int, data []byte) (image.Image, error) {
+func (Identicon) RandomUserImage(size int, data []byte) (image.Image, error) {
 	return randomImageSize(size, data)
 }
 
-func (_ Identicon) RandomOrgImage(size int, data []byte) (image.Image, error) {
+func (Identicon) RandomOrgImage(size int, data []byte) (image.Image, error) {
 	return randomImageSize(size, data)
 }
 
-func (_ Identicon) RandomRepoImage(size int, data []byte) (image.Image, error) {
+func (Identicon) RandomRepoImage(size int, data []byte) (image.Image, error) {
 	return randomImageSize(size, data)
 }
 

diff --git a/modules/avatar/none/none.go b/modules/avatar/none/none.go
@@ -11,18 +11,18 @@ import (
 // None wont generate an image
 type None struct{}
 
-func (_ None) Name() string {
+func (None) Name() string {
 	return "none"
 }
 
-func (_ None) RandomUserImage(size int, data []byte) (image.Image, error) {
+func (None) RandomUserImage(size int, data []byte) (image.Image, error) {
 	return nil, nil
 }
 
-func (_ None) RandomOrgImage(size int, data []byte) (image.Image, error) {
+func (None) RandomOrgImage(size int, data []byte) (image.Image, error) {
 	return nil, nil
 }
 
-func (_ None) RandomRepoImage(size int, data []byte) (image.Image, error) {
+func (None) RandomRepoImage(size int, data []byte) (image.Image, error) {
 	return nil, nil
 }
diff --git a/modules/avatar/robot/generate.go b/modules/avatar/robot/generate.go
@@ -15,19 +15,20 @@ import (
 // Robot is used to generate pseudo-random avatars
 type Robot struct{}
 
-func (_ Robot) Name() string {
+func (Robot) Name() string {
 	return "robot"
 }
 
-func (_ Robot) RandomUserImage(size int, data []byte) (image.Image, error) {
+func (Robot) RandomUserImage(size int, data []byte) (image.Image, error) {
 	a, err := avatars.Generate(string(data))
 	if err != nil {
 		return nil, err
 	}
 	return a.Image(avatars.RenderSize(size))
 }
 
-func (_ Robot) RandomOrgImage(size int, data []byte) (image.Image, error) {
+func (Robot) RandomOrgImage(size int, data []byte) (image.Image, error) {
+	size /= 2
 	img := image.NewRGBA(image.Rect(0, 0, size*2, size*2))
 
 	for i := 0; i < 4; i++ {
@@ -39,7 +40,7 @@ func (_ Robot) RandomOrgImage(size int, data []byte) (image.Image, error) {
 		if err != nil {
 			return nil, err
 		}
-		pos := image.Rect((i-int(i/2)*2)*size, int(i/2)*size, ((i-int(i/2)*2)+1)*size, (int(i/2)+1)*size)
+		pos := image.Rect((i-(i/2)*2)*size, (i/2)*size, ((i-(i/2)*2)+1)*size, ((i/2)+1)*size)
 		draw.Draw(img, pos, av, image.Point{}, draw.Over)
 	}