fix: address upstream CI lint issues (gci, gofumpt, modernize, nilnil)

- Fix import ordering (gci)
- Fix gofumpt formatting
- atomic.Int32 modernize
- Replace nil,nil return with empty map (nilnil)
- maps.Copy instead of manual loop (modernize)
- Fix useless-assert (store value before comparing)
- encoding/json → modules/json in timeline test

Signed-off-by: David E. Lovas <david@rexovas.com>

Author: davidlovas

services/migrations/github_graphql.go

@@ -23,14 +23,14 @@ package migrations
 import (
 	"bytes"
 	"context"
-	"gitea.dev/modules/json"
 	"fmt"
 	"net/http"
 	"slices"
 	"strconv"
 	"strings"
 	"time"
 
+	"gitea.dev/modules/json"
 	"gitea.dev/modules/log"
 	base "gitea.dev/modules/migration"
 )
@@ -120,8 +120,8 @@ func (g *GithubDownloaderV3) doGraphQL(ctx context.Context, query string, vars m
 		}
 
 		var envelope struct {
-			Data   json.Value `json:"data"`
-			Errors []graphQLError  `json:"errors"`
+			Data   json.Value     `json:"data"`
+			Errors []graphQLError `json:"errors"`
 		}
 		decodeErr := json.NewDecoder(resp.Body).Decode(&envelope)
 		header := resp.Header

services/migrations/github_graphql_pr_test.go

@@ -4,13 +4,13 @@
 package migrations
 
 import (
-	"gitea.dev/modules/json"
 	"testing"
 
-	base "gitea.dev/modules/migration"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"gitea.dev/modules/json"
+	base "gitea.dev/modules/migration"
 )
 
 // TestGraphQLPullRequestParsing validates that the PR response structs match the

services/migrations/github_graphql_test.go

@@ -4,7 +4,6 @@
 package migrations
 
 import (
-	"gitea.dev/modules/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -14,10 +13,11 @@ import (
 	"testing"
 	"time"
 
-	base "gitea.dev/modules/migration"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"gitea.dev/modules/json"
+	base "gitea.dev/modules/migration"
 )
 
 func TestIsGraphQLRateLimited(t *testing.T) {
@@ -57,9 +57,9 @@ func TestGraphQLRateResetWait(t *testing.T) {
 // bug: a RATE_LIMITED response is waited out (per the Retry-After header) and the
 // request retried in place, instead of erroring and aborting the whole sync.
 func TestDoGraphQLRetriesOnRateLimited(t *testing.T) {
-	var calls int32
+	var calls atomic.Int32
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if atomic.AddInt32(&calls, 1) == 1 {
+		if calls.Add(1) == 1 {
 			w.Header().Set("Retry-After", "1") // 1s so the test stays fast
 			io.WriteString(w, `{"errors":[{"type":"RATE_LIMITED","message":"API rate limit exceeded"}]}`)
 			return

services/migrations/github_graphql_timeline.go

@@ -24,6 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"hash/fnv"
+	"maps"
 	"slices"
 	"time"
 
@@ -40,8 +41,10 @@ const timelineBatchSize = 100
 // `... on MergedEvent` fragment) is a hard GraphQL validation error that aborts the
 // whole timeline pass. issueTimelineItemTypes is the set valid on BOTH unions; the PR
 // query adds the PR-only types on top.
-const issueTimelineItemTypes = "CLOSED_EVENT,REOPENED_EVENT,LOCKED_EVENT,UNLOCKED_EVENT,RENAMED_TITLE_EVENT,LABELED_EVENT,UNLABELED_EVENT,MILESTONED_EVENT,DEMILESTONED_EVENT,PINNED_EVENT,UNPINNED_EVENT"
-const prTimelineItemTypes = issueTimelineItemTypes + ",MERGED_EVENT,HEAD_REF_DELETED_EVENT,AUTO_MERGE_ENABLED_EVENT,AUTO_MERGE_DISABLED_EVENT"
+const (
+	issueTimelineItemTypes = "CLOSED_EVENT,REOPENED_EVENT,LOCKED_EVENT,UNLOCKED_EVENT,RENAMED_TITLE_EVENT,LABELED_EVENT,UNLABELED_EVENT,MILESTONED_EVENT,DEMILESTONED_EVENT,PINNED_EVENT,UNPINNED_EVENT"
+	prTimelineItemTypes    = issueTimelineItemTypes + ",MERGED_EVENT,HEAD_REF_DELETED_EVENT,AUTO_MERGE_ENABLED_EVENT,AUTO_MERGE_DISABLED_EVENT"
+)
 
 // Inline-fragment selections, likewise split. These event types expose no databaseId,
 // only the node id.
@@ -57,6 +60,7 @@ const issueTimelineFragments = `
         ... on DemilestonedEvent{id createdAt milestoneTitle actor{login ... on User{databaseId}}}
         ... on PinnedEvent{id createdAt actor{login ... on User{databaseId}}}
         ... on UnpinnedEvent{id createdAt actor{login ... on User{databaseId}}}`
+
 const prTimelineFragments = issueTimelineFragments + `
         ... on MergedEvent{id createdAt actor{login ... on User{databaseId}}}
         ... on HeadRefDeletedEvent{id createdAt headRefName actor{login ... on User{databaseId}}}
@@ -241,7 +245,7 @@ func (g *GithubDownloaderV3) attachTimelineEvents(ctx context.Context, nodeIDToI
 // than aborting; a hot entity with more than one page sweeps the remainder.
 func (g *GithubDownloaderV3) fetchTimelineEvents(ctx context.Context, ids []string) (map[string][]*base.Comment, error) {
 	if len(ids) == 0 {
-		return nil, nil
+		return map[string][]*base.Comment{}, nil
 	}
 	var resp struct {
 		Nodes []struct {
@@ -262,9 +266,8 @@ func (g *GithubDownloaderV3) fetchTimelineEvents(ctx context.Context, ids []stri
 			if err != nil {
 				return nil, err
 			}
-			for id, events := range right {
-				left[id] = events
-			}
+			maps.Copy(left, right)
+
 			return left, nil
 		}
 		return nil, err

services/migrations/github_graphql_timeline_test.go

@@ -4,12 +4,13 @@
 package migrations
 
 import (
-	"encoding/json"
 	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"gitea.dev/modules/json"
 )
 
 // TestConvertTimelineItems parses a timeline page (the shape of #13603's real
@@ -80,7 +81,8 @@ func TestConvertTimelineItems(t *testing.T) {
 
 func TestTimelineEventIDStable(t *testing.T) {
 	id := "MDExOkNsb3NlZEV2ZW50NDAwNjIwMjg0Mw=="
-	assert.Equal(t, timelineEventID(id), timelineEventID(id), "same node id -> same dedup key (idempotent re-sync)")
+	idVal := timelineEventID(id)
+	assert.Equal(t, idVal, timelineEventID(id), "same node id -> same dedup key (idempotent re-sync)")
 	assert.NotEqual(t, timelineEventID(id), timelineEventID("MDEyOkxhYmVsZWRFdmVudA=="))
 	assert.Positive(t, timelineEventID(id))
 }