fix lints

Author: techknowlogick

models/user/badge.go

@@ -6,11 +6,9 @@ package user
 import (
 	"context"
 	"fmt"
-	"net/url"
 	"strings"
 
 	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/modules/setting"
 
 	"xorm.io/builder"
 	"xorm.io/xorm"
@@ -36,10 +34,6 @@ func init() {
 	db.RegisterModel(new(UserBadge))
 }
 
-func AdminCreateBadge(ctx context.Context, badge *Badge) error {
-	return CreateBadge(ctx, badge)
-}
-
 // GetUserBadges returns the user's badges.
 func GetUserBadges(ctx context.Context, u *User) ([]*Badge, int64, error) {
 	sess := db.GetEngine(ctx).
@@ -52,34 +46,27 @@ func GetUserBadges(ctx context.Context, u *User) ([]*Badge, int64, error) {
 	return badges, count, err
 }
 
-// GetBadgeUsers returns the badges users.
+// GetBadgeUsers returns the users that have a specific badge.
 func GetBadgeUsers(ctx context.Context, b *Badge) ([]*User, int64, error) {
 	sess := db.GetEngine(ctx).
 		Select("`user`.*").
 		Join("INNER", "user_badge", "`user_badge`.user_id=user.id").
-		Where("user_badge.badge_id=?", b.ID)
-
+		Join("INNER", "badge", "`user_badge`.badge_id=badge.id").
+		Where("badge.slug=?", b.Slug)
 	users := make([]*User, 0, 8)
 	count, err := sess.FindAndCount(&users)
 	return users, count, err
 }
 
 // CreateBadge creates a new badge.
 func CreateBadge(ctx context.Context, badge *Badge) error {
-	isExist, err := IsBadgeExist(ctx, 0, badge.Slug)
-
-	if err != nil {
-		return err
-	} else if isExist {
-		return ErrBadgeAlreadyExist{badge.Slug}
-	}
-
-	_, err = db.GetEngine(ctx).Insert(badge)
+	// this will fail if the badge already exists due to the UNIQUE constraint
+	_, err := db.GetEngine(ctx).Insert(badge)
 
 	return err
 }
 
-// GetBadge returns a badge
+// GetBadge returns a specific badge
 func GetBadge(ctx context.Context, slug string) (*Badge, error) {
 	badge := new(Badge)
 	has, err := db.GetEngine(ctx).Where("slug=?", slug).Get(badge)
@@ -89,22 +76,9 @@ func GetBadge(ctx context.Context, slug string) (*Badge, error) {
 	return badge, err
 }
 
-// GetBadgeByID returns a badge
-func GetBadgeByID(ctx context.Context, id int64) (*Badge, error) {
-	badge := new(Badge)
-	has, err := db.GetEngine(ctx).Where("id=?", id).Get(badge)
-	if err != nil {
-		return nil, err
-	} else if !has {
-		return nil, ErrBadgeNotExist{ID: id}
-	}
-
-	return badge, err
-}
-
 // UpdateBadge updates a badge based on its slug.
 func UpdateBadge(ctx context.Context, badge *Badge) error {
-	_, err := db.GetEngine(ctx).Where("id=?", badge.ID).Cols("slug", "description", "image_url").Update(badge)
+	_, err := db.GetEngine(ctx).Where("slug=?", badge.Slug).Cols("description", "image_url").Update(badge)
 	return err
 }
 
@@ -114,24 +88,8 @@ func DeleteBadge(ctx context.Context, badge *Badge) error {
 	return err
 }
 
-// DeleteUserBadgeRecord deletes a user badge record.
-func DeleteUserBadgeRecord(ctx context.Context, badge *Badge) error {
-	userBadge := &UserBadge{
-		BadgeID: badge.ID,
-	}
-	_, err := db.GetEngine(ctx).Where("badge_id=?", userBadge.BadgeID).Delete(userBadge)
-	return err
-}
-
 // AddUserBadge adds a badge to a user.
 func AddUserBadge(ctx context.Context, u *User, badge *Badge) error {
-	isExist, err := IsBadgeUserExist(ctx, u.ID, badge.ID)
-	if err != nil {
-		return err
-	} else if isExist {
-		return ErrBadgeAlreadyExist{}
-	}
-
 	return AddUserBadges(ctx, u, []*Badge{badge})
 }
 
@@ -140,11 +98,11 @@ func AddUserBadges(ctx context.Context, u *User, badges []*Badge) error {
 	return db.WithTx(ctx, func(ctx context.Context) error {
 		for _, badge := range badges {
 			// hydrate badge and check if it exists
-			has, err := db.GetEngine(ctx).Where("id=?", badge.ID).Get(badge)
+			has, err := db.GetEngine(ctx).Where("slug=?", badge.Slug).Get(badge)
 			if err != nil {
 				return err
 			} else if !has {
-				return ErrBadgeNotExist{ID: badge.ID}
+				return ErrBadgeNotExist{Slug: badge.Slug}
 			}
 			if err := db.Insert(ctx, &UserBadge{
 				BadgeID: badge.ID,
@@ -162,11 +120,19 @@ func RemoveUserBadge(ctx context.Context, u *User, badge *Badge) error {
 	return RemoveUserBadges(ctx, u, []*Badge{badge})
 }
 
-// RemoveUserBadges removes badges from a user.
+// RemoveUserBadges removes specific badges from a user.
 func RemoveUserBadges(ctx context.Context, u *User, badges []*Badge) error {
 	return db.WithTx(ctx, func(ctx context.Context) error {
 		for _, badge := range badges {
-			if _, err := db.GetEngine(ctx).Delete(&UserBadge{BadgeID: badge.ID, UserID: u.ID}); err != nil {
+			subQuery := builder.
+				Select("id").
+				From("badge").
+				Where(builder.Eq{"slug": badge.Slug})
+
+			if _, err := db.GetEngine(ctx).
+				Where("`user_badge`.user_id=?", u.ID).
+				And(builder.In("badge_id", subQuery)).
+				Delete(&UserBadge{}); err != nil {
 				return err
 			}
 		}
@@ -180,28 +146,6 @@ func RemoveAllUserBadges(ctx context.Context, u *User) error {
 	return err
 }
 
-// HTMLURL returns the badges full link.
-func (u *Badge) HTMLURL() string {
-	return setting.AppURL + url.PathEscape(u.Slug)
-}
-
-// IsBadgeExist checks if given badge slug exist,
-// it is used when creating/updating a badge slug
-func IsBadgeExist(ctx context.Context, uid int64, slug string) (bool, error) {
-	if len(slug) == 0 {
-		return false, nil
-	}
-	return db.GetEngine(ctx).
-		Where("slug!=?", uid).
-		Get(&Badge{Slug: strings.ToLower(slug)})
-}
-
-// IsBadgeUserExist checks if given badge id, uid exist,
-func IsBadgeUserExist(ctx context.Context, uid, bid int64) (bool, error) {
-	return db.GetEngine(ctx).
-		Get(&UserBadge{UserID: uid, BadgeID: bid})
-}
-
 // SearchBadgeOptions represents the options when fdin badges
 type SearchBadgeOptions struct {
 	db.ListOptions

models/user/error.go

@@ -131,7 +131,6 @@ func (err ErrBadgeAlreadyExist) Unwrap() error {
 // ErrBadgeNotExist represents a "BadgeNotExist" kind of error.
 type ErrBadgeNotExist struct {
 	Slug string
-	ID   int64
 }
 
 // IsErrBadgeNotExist checks if an error is a ErrBadgeNotExist.
@@ -141,7 +140,7 @@ func IsErrBadgeNotExist(err error) bool {
 }
 
 func (err ErrBadgeNotExist) Error() string {
-	return fmt.Sprintf("badge does not exist [slug: %s | id: %d]", err.Slug, err.ID)
+	return fmt.Sprintf("badge does not exist [slug: %s]", err.Slug)
 }
 
 // Unwrap unwraps this error as a ErrNotExist error

modules/validation/binding.go

@@ -26,8 +26,8 @@ const (
 	ErrUsername = "UsernameError"
 	// ErrInvalidGroupTeamMap is returned when a group team mapping is invalid
 	ErrInvalidGroupTeamMap = "InvalidGroupTeamMap"
-	ErrInvalidImageURL     = "InvalidImageURL"
-	ErrInvalidSlug         = "InvalidSlug"
+	// ErrInvalidSlug is returned when a slug is invalid
+	ErrInvalidSlug = "InvalidSlug"
 )
 
 // AddBindingRules adds additional binding rules
@@ -40,7 +40,6 @@ func AddBindingRules() {
 	addGlobOrRegexPatternRule()
 	addUsernamePatternRule()
 	addValidGroupTeamMapRule()
-	addValidImageURLBindingRule()
 	addSlugPatternRule()
 }
 
@@ -98,24 +97,6 @@ func addValidSiteURLBindingRule() {
 	})
 }
 
-func addValidImageURLBindingRule() {
-	// URL validation rule
-	binding.AddRule(&binding.Rule{
-		IsMatch: func(rule string) bool {
-			return strings.HasPrefix(rule, "ValidImageUrl")
-		},
-		IsValid: func(errs binding.Errors, name string, val any) (bool, binding.Errors) {
-			str := fmt.Sprintf("%v", val)
-			if len(str) != 0 && !IsValidImageURL(str) {
-				errs.Add([]string{name}, ErrInvalidImageURL, "ImageURL")
-				return false, errs
-			}
-
-			return true, errs
-		},
-	})
-}
-
 func addSlugPatternRule() {
 	binding.AddRule(&binding.Rule{
 		IsMatch: func(rule string) bool {

modules/validation/helpers.go

@@ -6,7 +6,6 @@ package validation
 import (
 	"net"
 	"net/url"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -51,29 +50,6 @@ func IsValidSiteURL(uri string) bool {
 	return false
 }
 
-// IsValidImageURL checks if URL is valid and points to an image
-func IsValidImageURL(uri string) bool {
-	u, err := url.ParseRequestURI(uri)
-	if err != nil {
-		return false
-	}
-
-	if !validPort(portOnly(u.Host)) {
-		return false
-	}
-
-	for _, scheme := range setting.Service.ValidSiteURLSchemes {
-		if scheme == u.Scheme {
-			// Check if the path has an image file extension
-			ext := strings.ToLower(filepath.Ext(u.Path))
-			if ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".gif" || ext == ".bmp" || ext == ".svg" || ext == ".webp" {
-				return true
-			}
-		}
-	}
-	return false
-}
-
 // IsEmailDomainListed checks whether the domain of an email address
 // matches a list of domains
 func IsEmailDomainListed(globs []glob.Glob, email string) bool {

modules/web/middleware/binding.go

@@ -138,8 +138,6 @@ func Validate(errs binding.Errors, data map[string]any, f Form, l translation.Lo
 				data["ErrorMsg"] = trName + l.TrString("form.username_error")
 			case validation.ErrInvalidGroupTeamMap:
 				data["ErrorMsg"] = trName + l.TrString("form.invalid_group_team_map_error", errs[0].Message)
-			case validation.ErrInvalidImageURL:
-				data["ErrorMsg"] = l.TrString("form.invalid_image_url_error")
 			case validation.ErrInvalidSlug:
 				data["ErrorMsg"] = l.TrString("form.invalid_slug_error")
 			default:

options/locale/locale_en-US.ini

@@ -3032,7 +3032,7 @@ badges.edit_badge = Edit Badge
 badges.update_badge = Update Badge
 badges.delete_badge = Delete Badge
 badges.delete_badge_desc = Are you sure you want to permanently delete this badge?
-badges.users_with_badge = Users with Badge (%d)
+badges.users_with_badge = Users with Badge (%s)
 badges.add_user = Add User
 badges.remove_user = Remove User
 badges.delete_user_desc = Are you sure you want to remove this badge from the user?