run formatter

build_tools/swagger/main.go

@@ -3,14 +3,15 @@
 package main
 
 import (
-	"encoding/json"
 	"log"
 	"os"
 	"path/filepath"
 	"regexp"
+
+	"code.gitea.io/gitea/modules/json"
 )
 
-var rxPath = regexp.MustCompile("(?m)^(/repos/\\{owner})/(\\{repo})")
+var rxPath = regexp.MustCompile(`(?m)^(/repos/\{owner})/(\{repo})`)
 
 func generatePaths(root string) map[string]any {
 	pathData := make(map[string]any)
@@ -64,7 +65,7 @@ func writeMapToFile(filename string, data map[string]any) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	err = os.WriteFile(filename, bytes, 0666)
+	err = os.WriteFile(filename, bytes, 0o666)
 	if err != nil {
 		log.Fatal(err)
 	}

models/repo/wiki.go

@@ -5,10 +5,11 @@
 package repo
 
 import (
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/util"
 	"context"
 	"fmt"
+
+	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/util"
 )
 
 // ErrWikiAlreadyExist represents a "WikiAlreadyExist" kind of error.

routers/api/v1/api.go

@@ -1802,7 +1802,6 @@ func Routes() *web.Router {
 					m.Post("/group/{group_id}/{reponame}", admin.AdoptGroupRepository)
 					m.Delete("/group/{group_id}/{reponame}", admin.DeleteUnadoptedRepositoryInGroup)
 				})
-
 			})
 			m.Group("/hooks", func() {
 				m.Combo("").Get(admin.ListHooks).

services/group/group.go

@@ -4,7 +4,6 @@
 package group
 
 import (
-	"code.gitea.io/gitea/modules/gitrepo"
 	"context"
 	"errors"
 	"fmt"
@@ -15,6 +14,7 @@ import (
 	"code.gitea.io/gitea/models/organization"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/util"
 )

tests/integration/api_repo_test.go

@@ -80,66 +80,66 @@ func TestAPISearchRepo(t *testing.T) {
 	}{
 		{
 			name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50&private=false", expectedResults: expectedResults{
-			nil:   {count: 36},
+				nil:   {count: 36},
-			user:  {count: 36},
+				user:  {count: 36},
-			user2: {count: 36},
+				user2: {count: 36},
-		},
+			},
 		},
 		{
 			name: "RepositoriesMax10", requestURL: "/api/v1/repos/search?limit=10&private=false", expectedResults: expectedResults{
-			nil:   {count: 10},
+				nil:   {count: 10},
-			user:  {count: 10},
+				user:  {count: 10},
-			user2: {count: 10},
+				user2: {count: 10},
-		},
+			},
 		},
 		{
 			name: "RepositoriesDefault", requestURL: "/api/v1/repos/search?default&private=false", expectedResults: expectedResults{
-			nil:   {count: 10},
+				nil:   {count: 10},
-			user:  {count: 10},
+				user:  {count: 10},
-			user2: {count: 10},
+				user2: {count: 10},
-		},
+			},
 		},
 		{
 			name: "RepositoriesByName", requestURL: fmt.Sprintf("/api/v1/repos/search?q=%s&private=false", "big_test_"), expectedResults: expectedResults{
-			nil:   {count: 7, repoName: "big_test_"},
+				nil:   {count: 7, repoName: "big_test_"},
-			user:  {count: 7, repoName: "big_test_"},
+				user:  {count: 7, repoName: "big_test_"},
-			user2: {count: 7, repoName: "big_test_"},
+				user2: {count: 7, repoName: "big_test_"},
-		},
+			},
 		},
 		{
 			name: "RepositoriesByName", requestURL: fmt.Sprintf("/api/v1/repos/search?q=%s&private=false", "user2/big_test_"), expectedResults: expectedResults{
-			user2: {count: 2, repoName: "big_test_"},
+				user2: {count: 2, repoName: "big_test_"},
-		},
+			},
 		},
 		{
 			name: "RepositoriesAccessibleAndRelatedToUser", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", user.ID), expectedResults: expectedResults{
-			nil:   {count: 5},
+				nil:   {count: 5},
-			user:  {count: 9, includesPrivate: true},
+				user:  {count: 9, includesPrivate: true},
-			user2: {count: 6, includesPrivate: true},
+				user2: {count: 6, includesPrivate: true},
-		},
+			},
 		},
 		{
 			name: "RepositoriesAccessibleAndRelatedToUser2", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", user2.ID), expectedResults: expectedResults{
-			nil:   {count: 1},
+				nil:   {count: 1},
-			user:  {count: 2, includesPrivate: true},
+				user:  {count: 2, includesPrivate: true},
-			user2: {count: 2, includesPrivate: true},
+				user2: {count: 2, includesPrivate: true},
-			user4: {count: 1},
+				user4: {count: 1},
-		},
+			},
 		},
 		{
 			name: "RepositoriesAccessibleAndRelatedToUser3", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", org3.ID), expectedResults: expectedResults{
-			nil:   {count: 1},
+				nil:   {count: 1},
-			user:  {count: 4, includesPrivate: true},
+				user:  {count: 4, includesPrivate: true},
-			user2: {count: 3, includesPrivate: true},
+				user2: {count: 3, includesPrivate: true},
-			org3:  {count: 4, includesPrivate: true},
+				org3:  {count: 4, includesPrivate: true},
-		},
+			},
 		},
 		{
 			name: "RepositoriesOwnedByOrganization", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", orgUser.ID), expectedResults: expectedResults{
-			nil:   {count: 1, repoOwnerID: orgUser.ID},
+				nil:   {count: 1, repoOwnerID: orgUser.ID},
-			user:  {count: 2, repoOwnerID: orgUser.ID, includesPrivate: true},
+				user:  {count: 2, repoOwnerID: orgUser.ID, includesPrivate: true},
-			user2: {count: 1, repoOwnerID: orgUser.ID},
+				user2: {count: 1, repoOwnerID: orgUser.ID},
-		},
+			},
 		},
 		{name: "RepositoriesAccessibleAndRelatedToUser4", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", user4.ID), expectedResults: expectedResults{
 			nil:   {count: 3},