Revert "common: use X-Total-Count in multi-page results"

This reverts commit 5addde0a71.

common/gitea_utils.go

@@ -24,13 +24,11 @@ import (
 	"fmt"
 	"io"
 	"log"
-	"net/http"
 	"net/url"
 	"os"
 	"path"
 	"path/filepath"
 	"slices"
-	"strconv"
 	"time"
 
 	transport "github.com/go-openapi/runtime/client"
@@ -200,32 +198,7 @@ type Gitea interface {
 	GetCurrentUser() (*models.User, error)
 }
 
-type GiteaHeaderInterceptor struct {
-	Length int
-	http.RoundTripper
-}
-
-func (i *GiteaHeaderInterceptor) RoundTrip(req *http.Request) (*http.Response, error) {
-	resp, err := i.RoundTripper.RoundTrip(req)
-	if err != nil {
-		return nil, err
-	}
-	count_header := resp.Header["X-Total-Count"]
-	if len(count_header) == 1 {
-		i.Length, err = strconv.Atoi(resp.Header["X-Total-Count"][0])
-		if err != nil {
-			LogError("Converting X-Total-Count response header error", err)
-			i.Length = -1
-			return nil, err
-		}
-	} else {
-		i.Length = -1
-	}
-	return resp, nil
-}
-
 type GiteaTransport struct {
-	headers   *GiteaHeaderInterceptor
 	transport *transport.Runtime
 	client    *apiclient.GiteaAPI
 }
@@ -238,9 +211,7 @@ func AllocateGiteaTransport(giteaUrl string) Gitea {
 		log.Panicln("Failed to parse gitea url:", err)
 	}
 
-	r.headers = &GiteaHeaderInterceptor{RoundTripper: http.DefaultTransport}
 	r.transport = transport.New(url.Host, apiclient.DefaultBasePath, [](string){url.Scheme})
-	r.transport.Transport = r.headers
 	r.transport.DefaultAuthentication = transport.BearerToken(giteaToken)
 
 	r.client = apiclient.New(r.transport, nil)
@@ -315,9 +286,10 @@ func (gitea *GiteaTransport) ManualMergePR(org, repo string, num int64, commitid
 }
 
 func (gitea *GiteaTransport) GetPullRequests(org, repo string) ([]*models.PullRequest, error) {
-	var page int64
+	var page, limit int64
 
 	prs := make([]*models.PullRequest, 0)
+	limit = 20
 	state := "open"
 
 	for {
@@ -329,7 +301,8 @@ func (gitea *GiteaTransport) GetPullRequests(org, repo string) ([]*models.PullRe
 				WithOwner(org).
 				WithRepo(repo).
 				WithState(&state).
-				WithPage(&page),
+				WithPage(&page).
+				WithLimit(&limit),
 			gitea.transport.DefaultAuthentication)
 
 		if err != nil {
@@ -340,7 +313,7 @@ func (gitea *GiteaTransport) GetPullRequests(org, repo string) ([]*models.PullRe
 			break
 		}
 		prs = slices.Concat(prs, req.Payload)
-		if len(prs) >= gitea.headers.Length {
+		if len(req.Payload) < int(limit) {
 			break
 		}
 	}
@@ -349,13 +322,13 @@ func (gitea *GiteaTransport) GetPullRequests(org, repo string) ([]*models.PullRe
 }
 
 func (gitea *GiteaTransport) GetCommitStatus(org, repo, hash string) ([]*models.CommitStatus, error) {
-	var page int64
+	page := int64(1)
+	limit := int64(10)
 	var res []*models.CommitStatus
 
 	for {
-		page++
 		r, err := gitea.client.Repository.RepoListStatuses(
-			repository.NewRepoListStatusesParams().WithDefaults().WithOwner(org).WithRepo(repo).WithSha(hash).WithPage(&page),
+			repository.NewRepoListStatusesParams().WithDefaults().WithOwner(org).WithRepo(repo).WithSha(hash).WithPage(&page).WithLimit(&limit),
 			gitea.transport.DefaultAuthentication)
 
 		if err != nil {
@@ -365,9 +338,7 @@ func (gitea *GiteaTransport) GetCommitStatus(org, repo, hash string) ([]*models.
 			break
 		}
 		res = append(res, r.Payload...)
-		if len(res) >= gitea.headers.Length {
-			break
-		}
+		page++
 	}
 
 	return res, nil
@@ -408,18 +379,19 @@ func (gitea *GiteaTransport) GetRepository(org, pkg string) (*models.Repository,
 }
 
 func (gitea *GiteaTransport) GetPullRequestReviews(org, project string, PRnum int64) ([]*models.PullReview, error) {
+	limit := int64(20)
 	var page int64
 	var allReviews []*models.PullReview
 
 	for {
-		page++
 		reviews, err := gitea.client.Repository.RepoListPullReviews(
 			repository.NewRepoListPullReviewsParams().
 				WithDefaults().
 				WithOwner(org).
 				WithRepo(project).
 				WithIndex(PRnum).
-				WithPage(&page),
+				WithPage(&page).
+				WithLimit(&limit),
 			gitea.transport.DefaultAuthentication,
 		)
 
@@ -431,9 +403,7 @@ func (gitea *GiteaTransport) GetPullRequestReviews(org, project string, PRnum in
 			break
 		}
 		allReviews = slices.Concat(allReviews, reviews.Payload)
-		if len(allReviews) >= gitea.headers.Length {
-			break
-		}
+		page++
 	}
 
 	return allReviews, nil
@@ -501,6 +471,7 @@ const (
 )
 
 func (gitea *GiteaTransport) GetNotifications(Type string, since *time.Time) ([]*models.NotificationThread, error) {
+	bigLimit := int64(20)
 	ret := make([]*models.NotificationThread, 0, 100)
 
 	for page := int64(1); ; page++ {
@@ -508,6 +479,7 @@ func (gitea *GiteaTransport) GetNotifications(Type string, since *time.Time) ([]
 			WithDefaults().
 			WithSubjectType([]string{Type}).
 			WithStatusTypes([]string{"unread"}).
+			WithLimit(&bigLimit).
 			WithPage(&page)
 
 		if since != nil {
@@ -524,7 +496,7 @@ func (gitea *GiteaTransport) GetNotifications(Type string, since *time.Time) ([]
 			break
 		}
 		ret = slices.Concat(ret, list.Payload)
-		if len(ret) >= gitea.headers.Length {
+		if len(list.Payload) < int(bigLimit) {
 			break
 		}
 	}
@@ -533,6 +505,7 @@ func (gitea *GiteaTransport) GetNotifications(Type string, since *time.Time) ([]
 }
 
 func (gitea *GiteaTransport) GetDoneNotifications(Type string, page int64) ([]*models.NotificationThread, error) {
+	limit := int64(20)
 	t := true
 
 	if page <= 0 {
@@ -543,6 +516,7 @@ func (gitea *GiteaTransport) GetDoneNotifications(Type string, page int64) ([]*m
 			WithAll(&t).
 			WithSubjectType([]string{Type}).
 			WithStatusTypes([]string{"read"}).
+			WithLimit(&limit).
 			WithPage(&page),
 		gitea.transport.DefaultAuthentication)
 	if err != nil {
@@ -595,12 +569,9 @@ func (gitea *GiteaTransport) GetOrganizationRepositories(orgName string) ([]*mod
 		if len(ret.Payload) == 0 {
 			break
 		}
+
 		repos = append(repos, ret.Payload...)
 		page++
-
-		if len(repos) >= gitea.headers.Length {
-			break
-		}
 	}
 
 	return repos, nil
@@ -819,13 +790,13 @@ func (gitea *GiteaTransport) GetTimeline(org, repo string, idx int64) ([]*models
 		}
 		page++
 
-		retData = append(retData, res.Payload...)
-		if len(retData) >= gitea.headers.Length {
-			break
+		for _, d := range res.Payload {
+			if d != nil {
+				retData = append(retData, d)
+			}
 		}
 	}
 	LogDebug("total results:", len(retData))
-	retData = slices.DeleteFunc(retData, func(a *models.TimelineComment) bool { return a == nil })
 	slices.SortFunc(retData, func(a, b *models.TimelineComment) int {
 		return time.Time(b.Created).Compare(time.Time(a.Created))
 	})