Optimize: bump to Go 1.21 and clean some code

go.mod

@@ -1,6 +1,6 @@
 module pixivfe
 
-go 1.20
+go 1.21
 
 require (
 	github.com/goccy/go-json v0.10.2

handler/artwork.go

@@ -81,7 +81,7 @@ func (p *PixivClient) GetArtworkByID(id string) (*models.Illust, error) {
 	sort.Sort(sort.Reverse(sort.IntSlice(ids)))
 
 	idsString := ""
-	count := Min(len(ids), 30)
+	count := min(len(ids), 30)
 
 	for i := 0; i < count; i++ {
 		idsString += fmt.Sprintf("&ids[]=%d", ids[i])

handler/helpers.go

@@ -1,8 +0,0 @@
-package handler
-
-func Min(x, y int) int {
-	if x < y {
-		return x
-	}
-	return y
-}

handler/misc.go

@@ -98,7 +98,7 @@ func (p *PixivClient) GetDiscoveryArtwork(mode string, count int) ([]models.Illu
 	var artworks []models.IllustShort
 
 	for count > 0 {
-		itemsForRequest := Min(100, count)
+		itemsForRequest := min(100, count)
 
 		count -= itemsForRequest
 

handler/top.go

@@ -85,7 +85,7 @@ func (p *PixivClient) GetLandingPage(mode string) (models.LandingArtworks, error
 
 	for i := 0; i < len(pages.RecommendedByTags); i++ {
 		temp := pages.RecommendedByTags[i]
-		temp.Artworks = artworks.Artworks[count : count+Min(len(temp.Ids), 18)]
+		temp.Artworks = artworks.Artworks[count : count+min(len(temp.Ids), 18)]
 
 		context.RecommendByTags = append(context.RecommendByTags, temp.LandingRecommendByTags)
 		count += len(temp.Ids)

handler/user.go

@@ -67,7 +67,7 @@ func (p *PixivClient) GetUserArtworksID(id string, category string, page int) (s
 	}
 
 	start := (page - 1) * int(worksPerPage)
-	end := int(math.Min(float64(page)*worksPerPage, worksNumber)) // no overflow
+	end := int(min(float64(page)*worksPerPage, worksNumber)) // no overflow
 
 	for _, k := range ids[start:end] {
 		idsString += fmt.Sprintf("&ids[]=%d", k)