Move sdk from code.gitea.io/sdk/gitea to gitea.dev/sdk (#1006)

Reviewed-on: https://gitea.com/gitea/tea/pulls/1006
Reviewed-by: Zettat123 <39446+zettat123@noreply.gitea.com>

modules/auth/oauth.go

@@ -53,12 +53,12 @@ type OAuthOptions struct {
 }
 
 // OAuthLogin performs an OAuth2 PKCE login flow to authorize the CLI
-func OAuthLogin(name, giteaURL string) error {
-	return OAuthLoginWithOptions(name, giteaURL, false)
+func OAuthLogin(ctx context.Context, name, giteaURL string) error {
+	return OAuthLoginWithOptions(ctx, name, giteaURL, false)
 }
 
 // OAuthLoginWithOptions performs an OAuth2 PKCE login flow with additional options
-func OAuthLoginWithOptions(name, giteaURL string, insecure bool) error {
+func OAuthLoginWithOptions(ctx context.Context, name, giteaURL string, insecure bool) error {
 	opts := OAuthOptions{
 		Name:        name,
 		URL:         giteaURL,
@@ -67,22 +67,22 @@ func OAuthLoginWithOptions(name, giteaURL string, insecure bool) error {
 		RedirectURL: fmt.Sprintf("http://%s:%d", redirectHost, redirectPort),
 		Port:        redirectPort,
 	}
-	return OAuthLoginWithFullOptions(opts)
+	return OAuthLoginWithFullOptions(ctx, opts)
 }
 
 // OAuthLoginWithFullOptions performs an OAuth2 PKCE login flow with full options control
-func OAuthLoginWithFullOptions(opts OAuthOptions) error {
-	serverURL, token, err := performBrowserOAuthFlow(opts)
+func OAuthLoginWithFullOptions(ctx context.Context, opts OAuthOptions) error {
+	serverURL, token, err := performBrowserOAuthFlow(ctx, opts)
 	if err != nil {
 		return err
 	}
 
-	return createLoginFromToken(opts.Name, serverURL, token, opts.Insecure)
+	return createLoginFromToken(ctx, opts.Name, serverURL, token, opts.Insecure)
 }
 
 // performBrowserOAuthFlow performs the browser-based OAuth2 PKCE flow and returns the token.
 // This is the shared implementation used by both new logins and re-authentication.
-func performBrowserOAuthFlow(opts OAuthOptions) (serverURL string, token *oauth2.Token, err error) {
+func performBrowserOAuthFlow(ctx context.Context, opts OAuthOptions) (serverURL string, token *oauth2.Token, err error) {
 	// Normalize URL
 	normalizedURL, err := utils.NormalizeURL(opts.URL)
 	if err != nil {
@@ -127,7 +127,6 @@ func performBrowserOAuthFlow(opts OAuthOptions) (serverURL string, token *oauth2
 	codeChallenge := generateCodeChallenge(codeVerifier)
 
 	// Set up the OAuth2 config
-	ctx := context.Background()
 	ctx = context.WithValue(ctx, oauth2.HTTPClient, createHTTPClient(opts.Insecure))
 
 	// Configure the OAuth2 endpoints
@@ -366,7 +365,7 @@ func openBrowser(url string) error {
 }
 
 // createLoginFromToken creates a login entry using the obtained access token
-func createLoginFromToken(name, serverURL string, token *oauth2.Token, insecure bool) error {
+func createLoginFromToken(ctx context.Context, name, serverURL string, token *oauth2.Token, insecure bool) error {
 	if name == "" {
 		var err error
 		name, err = task.GenerateLoginName(serverURL, "")
@@ -388,7 +387,7 @@ func createLoginFromToken(name, serverURL string, token *oauth2.Token, insecure
 
 	// Validate token by getting user info
 	client := login.Client()
-	u, _, err := client.GetMyUserInfo()
+	u, _, err := client.Users.GetMyUserInfo(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to validate token: %s", err)
 	}
@@ -429,7 +428,7 @@ func RefreshAccessToken(login *config.Login) error {
 
 // ReauthenticateLogin performs a full browser-based OAuth flow to get new tokens
 // for an existing login. This is used when the refresh token is expired or invalid.
-func ReauthenticateLogin(login *config.Login) error {
+func ReauthenticateLogin(ctx context.Context, login *config.Login) error {
 	opts := OAuthOptions{
 		Name:        login.Name,
 		URL:         login.URL,
@@ -439,7 +438,7 @@ func ReauthenticateLogin(login *config.Login) error {
 		Port:        redirectPort,
 	}
 
-	_, token, err := performBrowserOAuthFlow(opts)
+	_, token, err := performBrowserOAuthFlow(ctx, opts)
 	if err != nil {
 		return err
 	}

modules/config/login.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/debug"
 	"gitea.dev/tea/modules/httputil"
@@ -342,7 +342,7 @@ func (l *Login) RefreshOAuthToken() error {
 				}
 
 				// Still need to refresh - proceed with OAuth call
-				newToken, err := doOAuthRefresh(l)
+				newToken, err := doOAuthRefresh(context.Background(), l)
 				if err != nil {
 					return err
 				}
@@ -370,7 +370,7 @@ func (l *Login) RefreshOAuthToken() error {
 }
 
 // doOAuthRefresh performs the actual OAuth token refresh API call.
-func doOAuthRefresh(l *Login) (*oauth2.Token, error) {
+func doOAuthRefresh(ctx context.Context, l *Login) (*oauth2.Token, error) {
 	// Build current token from credstore (single load) or YAML fields
 	var accessToken, refreshToken string
 	var expiry time.Time
@@ -389,8 +389,6 @@ func doOAuthRefresh(l *Login) (*oauth2.Token, error) {
 		Expiry:       expiry,
 	}
 
-	ctx := context.Background()
-
 	httpClient := &http.Client{
 		Transport: httputil.WrapTransport(&http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: l.Insecure},

modules/interact/comments.go

@@ -4,10 +4,11 @@
 package interact
 
 import (
+	stdctx "context"
 	"fmt"
 	"os"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/cmd/flags"
 	"gitea.dev/tea/modules/context"
@@ -20,18 +21,18 @@ import (
 
 // ShowCommentsMaybeInteractive fetches & prints comments, depending on the --comments flag.
 // If that flag is unset, and output is not piped, prompts the user first.
-func ShowCommentsMaybeInteractive(ctx *context.TeaContext, idx int64, totalComments int) error {
+func ShowCommentsMaybeInteractive(requestCtx stdctx.Context, ctx *context.TeaContext, idx int64, totalComments int) error {
 	if ctx.Bool("comments") {
 		opts := gitea.ListIssueCommentOptions{ListOptions: flags.GetListOptions(ctx.Command)}
 		c := ctx.Login.Client()
-		comments, _, err := c.ListIssueComments(ctx.Owner, ctx.Repo, idx, opts)
+		comments, _, err := c.Issues.ListIssueComments(requestCtx, ctx.Owner, ctx.Repo, idx, opts)
 		if err != nil {
 			return err
 		}
 		print.Comments(comments)
 	} else if print.IsInteractive() && !ctx.IsSet("comments") {
 		// if we're interactive, but --comments hasn't been explicitly set to false
-		if err := ShowCommentsPaginated(ctx, idx, totalComments); err != nil {
+		if err := ShowCommentsPaginated(requestCtx, ctx, idx, totalComments); err != nil {
 			fmt.Printf("error while loading comments: %v\n", err)
 		}
 	}
@@ -39,7 +40,7 @@ func ShowCommentsMaybeInteractive(ctx *context.TeaContext, idx int64, totalComme
 }
 
 // ShowCommentsPaginated prompts if issue/pr comments should be shown and continues to do so.
-func ShowCommentsPaginated(ctx *context.TeaContext, idx int64, totalComments int) error {
+func ShowCommentsPaginated(requestCtx stdctx.Context, ctx *context.TeaContext, idx int64, totalComments int) error {
 	c := ctx.Login.Client()
 	opts := gitea.ListIssueCommentOptions{ListOptions: flags.GetListOptions(ctx.Command)}
 	prompt := "show comments?"
@@ -59,7 +60,7 @@ func ShowCommentsPaginated(ctx *context.TeaContext, idx int64, totalComments int
 		} else if !loadComments {
 			break
 		} else {
-			if comments, _, err := c.ListIssueComments(ctx.Owner, ctx.Repo, idx, opts); err != nil {
+			if comments, _, err := c.Issues.ListIssueComments(requestCtx, ctx.Owner, ctx.Repo, idx, opts); err != nil {
 				return err
 			} else if len(comments) != 0 {
 				print.Comments(comments)

modules/interact/issue_create.go

@@ -4,9 +4,10 @@
 package interact
 
 import (
+	"context"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	"gitea.dev/tea/modules/task"
@@ -21,7 +22,7 @@ func IsQuitting(err error) bool {
 }
 
 // CreateIssue interactively creates an issue
-func CreateIssue(login *config.Login, owner, repo string) error {
+func CreateIssue(ctx context.Context, login *config.Login, owner, repo string) error {
 	owner, repo, err := promptRepoSlug(owner, repo)
 	if err != nil {
 		return err
@@ -29,19 +30,19 @@ func CreateIssue(login *config.Login, owner, repo string) error {
 	printTitleAndContent("Target repo:", owner+"/"+repo)
 
 	var opts gitea.CreateIssueOption
-	if err := promptIssueProperties(login, owner, repo, &opts); err != nil {
+	if err := promptIssueProperties(ctx, login, owner, repo, &opts); err != nil {
 		return err
 	}
 
-	return task.CreateIssue(login, owner, repo, opts)
+	return task.CreateIssue(ctx, login, owner, repo, opts)
 }
 
-func promptIssueProperties(login *config.Login, owner, repo string, o *gitea.CreateIssueOption) error {
+func promptIssueProperties(ctx context.Context, login *config.Login, owner, repo string, o *gitea.CreateIssueOption) error {
 	var milestoneName string
 	var err error
 
 	selectableChan := make(chan (issueSelectables), 1)
-	go fetchIssueSelectables(login, owner, repo, selectableChan)
+	go fetchIssueSelectables(ctx, login, owner, repo, selectableChan)
 
 	// title
 	if err := huh.NewInput().
@@ -140,12 +141,12 @@ type issueSelectables struct {
 	Err           error
 }
 
-func fetchIssueSelectables(login *config.Login, owner, repo string, done chan issueSelectables) {
+func fetchIssueSelectables(ctx context.Context, login *config.Login, owner, repo string, done chan issueSelectables) {
 	// TODO PERF make these calls concurrent
 	r := issueSelectables{}
 	c := login.Client()
 
-	r.Repo, _, r.Err = c.GetRepo(owner, repo)
+	r.Repo, _, r.Err = c.Repositories.GetRepo(ctx, owner, repo)
 	if r.Err != nil {
 		done <- r
 		return
@@ -157,7 +158,7 @@ func fetchIssueSelectables(login *config.Login, owner, repo string, done chan is
 		return
 	}
 
-	assignees, _, err := c.GetAssignees(owner, repo)
+	assignees, _, err := c.Repositories.GetAssignees(ctx, owner, repo)
 	if err != nil {
 		r.Err = err
 		done <- r
@@ -168,7 +169,7 @@ func fetchIssueSelectables(login *config.Login, owner, repo string, done chan is
 		r.Assignees[i] = u.UserName
 	}
 
-	milestones, _, err := c.ListRepoMilestones(owner, repo, gitea.ListMilestoneOption{})
+	milestones, _, err := c.Repositories.ListMilestones(ctx, owner, repo, gitea.ListMilestoneOption{})
 	if err != nil {
 		r.Err = err
 		done <- r
@@ -184,7 +185,7 @@ func fetchIssueSelectables(login *config.Login, owner, repo string, done chan is
 	r.LabelMap = make(map[string]int64)
 	r.LabelList = make([]string, 0)
 	for page := 1; ; {
-		labels, resp, err := c.ListRepoLabels(owner, repo, gitea.ListLabelsOptions{
+		labels, resp, err := c.Repositories.ListRepoLabels(ctx, owner, repo, gitea.ListLabelsOptions{
 			ListOptions: gitea.ListOptions{Page: page, PageSize: 50},
 		})
 		if err != nil {

modules/interact/issue_edit.go

@@ -4,6 +4,7 @@
 package interact
 
 import (
+	stdctx "context"
 	"slices"
 	"strings"
 
@@ -16,7 +17,7 @@ import (
 )
 
 // EditIssue interactively edits an issue
-func EditIssue(ctx context.TeaContext, index int64) (*task.EditIssueOption, error) {
+func EditIssue(requestCtx stdctx.Context, ctx context.TeaContext, index int64) (*task.EditIssueOption, error) {
 	opts := task.EditIssueOption{}
 	var err error
 
@@ -27,7 +28,7 @@ func EditIssue(ctx context.TeaContext, index int64) (*task.EditIssueOption, erro
 	printTitleAndContent("Target repo:", ctx.Owner+"/"+ctx.Repo)
 
 	c := ctx.Login.Client()
-	i, _, err := c.GetIssue(ctx.Owner, ctx.Repo, index)
+	i, _, err := c.Issues.GetIssue(requestCtx, ctx.Owner, ctx.Repo, index)
 	if err != nil {
 		return &opts, err
 	}
@@ -55,20 +56,20 @@ func EditIssue(ctx context.TeaContext, index int64) (*task.EditIssueOption, erro
 		opts.Milestone = &i.Milestone.Title
 	}
 
-	if err := promptIssueEditProperties(&ctx, &opts); err != nil {
+	if err := promptIssueEditProperties(requestCtx, &ctx, &opts); err != nil {
 		return &opts, err
 	}
 
 	return &opts, err
 }
 
-func promptIssueEditProperties(ctx *context.TeaContext, o *task.EditIssueOption) error {
+func promptIssueEditProperties(requestCtx stdctx.Context, ctx *context.TeaContext, o *task.EditIssueOption) error {
 	var milestoneName string
 	var labelsSelected []string
 	var err error
 
 	selectableChan := make(chan (issueSelectables), 1)
-	go fetchIssueSelectables(ctx.Login, ctx.Owner, ctx.Repo, selectableChan)
+	go fetchIssueSelectables(requestCtx, ctx.Login, ctx.Owner, ctx.Repo, selectableChan)
 
 	// title
 	if err := huh.NewInput().

modules/interact/login.go

@@ -4,6 +4,7 @@
 package interact
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/url"
@@ -11,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/auth"
 	"gitea.dev/tea/modules/config"
@@ -22,7 +23,7 @@ import (
 )
 
 // CreateLogin create an login interactive
-func CreateLogin() error {
+func CreateLogin(ctx context.Context) error {
 	var (
 		name, token, user, passwd, otp, scopes, sshKey, sshCertPrincipal, sshKeyFingerprint string
 		insecure, sshAgent, versionCheck, helper                                            bool
@@ -104,7 +105,7 @@ func CreateLogin() error {
 		}
 		printTitleAndContent("Allow Insecure connections:", strconv.FormatBool(insecure))
 
-		return auth.OAuthLoginWithOptions(name, giteaURL, insecure)
+		return auth.OAuthLoginWithOptions(ctx, name, giteaURL, insecure)
 	default: // token
 		var hasToken bool
 		if err := huh.NewConfirm().
@@ -270,7 +271,7 @@ func CreateLogin() error {
 		printTitleAndContent("Check version of Gitea instance:", strconv.FormatBool(versionCheck))
 	}
 
-	return task.CreateLogin(name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint, insecure, sshAgent, versionCheck, helper)
+	return task.CreateLogin(ctx, name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint, insecure, sshAgent, versionCheck, helper)
 }
 
 var tokenScopeOpts = []string{

modules/interact/milestone_create.go

@@ -4,11 +4,11 @@
 package interact
 
 import (
+	stdctx "context"
 	"fmt"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
-
+	gitea "gitea.dev/sdk"
 	"gitea.dev/tea/modules/config"
 	"gitea.dev/tea/modules/task"
 	"gitea.dev/tea/modules/theme"
@@ -17,7 +17,7 @@ import (
 )
 
 // CreateMilestone interactively creates a milestone
-func CreateMilestone(login *config.Login, owner, repo string) error {
+func CreateMilestone(requestCtx stdctx.Context, login *config.Login, owner, repo string) error {
 	var title, description, deadline string
 
 	// owner, repo
@@ -60,8 +60,7 @@ func CreateMilestone(login *config.Login, owner, repo string) error {
 		deadlineTM = &tm
 	}
 
-	return task.CreateMilestone(
-		login,
+	return task.CreateMilestone(requestCtx, login,
 		owner,
 		repo,
 		title,

modules/interact/pull_create.go

@@ -4,8 +4,9 @@
 package interact
 
 import (
-	"code.gitea.io/sdk/gitea"
+	stdctx "context"
 
+	gitea "gitea.dev/sdk"
 	"gitea.dev/tea/modules/context"
 	"gitea.dev/tea/modules/task"
 	"gitea.dev/tea/modules/theme"
@@ -14,7 +15,7 @@ import (
 )
 
 // CreatePull interactively creates a PR
-func CreatePull(ctx *context.TeaContext) (err error) {
+func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext) (err error) {
 	var (
 		base, head           string
 		allowMaintainerEdits = true
@@ -28,7 +29,7 @@ func CreatePull(ctx *context.TeaContext) (err error) {
 	}
 
 	// base
-	if base, err = task.GetDefaultPRBase(ctx.Login, ctx.Owner, ctx.Repo); err != nil {
+	if base, err = task.GetDefaultPRBase(requestCtx, ctx.Login, ctx.Owner, ctx.Repo); err != nil {
 		return err
 	}
 
@@ -86,11 +87,12 @@ func CreatePull(ctx *context.TeaContext) (err error) {
 		}
 
 		opts := gitea.CreateIssueOption{Title: task.GetDefaultPRTitle(head)}
-		if err = promptIssueProperties(ctx.Login, ctx.Owner, ctx.Repo, &opts); err != nil {
+		if err = promptIssueProperties(requestCtx, ctx.Login, ctx.Owner, ctx.Repo, &opts); err != nil {
 			return err
 		}
 
 		return task.CreateAgitFlowPull(
+			requestCtx,
 			ctx,
 			baseRemote,
 			head,
@@ -128,11 +130,12 @@ func CreatePull(ctx *context.TeaContext) (err error) {
 	head = task.GetHeadSpec(headOwner, headBranch, ctx.Owner)
 
 	opts := gitea.CreateIssueOption{Title: task.GetDefaultPRTitle(head)}
-	if err = promptIssueProperties(ctx.Login, ctx.Owner, ctx.Repo, &opts); err != nil {
+	if err = promptIssueProperties(requestCtx, ctx.Login, ctx.Owner, ctx.Repo, &opts); err != nil {
 		return err
 	}
 
 	return task.CreatePull(
+		requestCtx,
 		ctx,
 		base,
 		head,

modules/interact/pull_merge.go

@@ -4,10 +4,11 @@
 package interact
 
 import (
+	stdctx "context"
 	"fmt"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/cmd/flags"
 	"gitea.dev/tea/modules/context"
@@ -18,7 +19,7 @@ import (
 )
 
 // MergePull interactively creates a PR
-func MergePull(ctx *context.TeaContext) error {
+func MergePull(requestCtx stdctx.Context, ctx *context.TeaContext) error {
 	if ctx.LocalRepo == nil {
 		return fmt.Errorf("pull request index is required")
 	}
@@ -28,12 +29,12 @@ func MergePull(ctx *context.TeaContext) error {
 		return err
 	}
 
-	idx, err := getPullIndex(ctx, branch)
+	idx, err := getPullIndex(requestCtx, ctx, branch)
 	if err != nil {
 		return err
 	}
 
-	return task.PullMerge(ctx.Login, ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
+	return task.PullMerge(requestCtx, ctx.Login, ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
 		Style:   gitea.MergeStyle(ctx.String("style")),
 		Title:   ctx.String("title"),
 		Message: ctx.String("message"),
@@ -41,7 +42,7 @@ func MergePull(ctx *context.TeaContext) error {
 }
 
 // getPullIndex interactively determines the PR index
-func getPullIndex(ctx *context.TeaContext, branch string) (int64, error) {
+func getPullIndex(requestCtx stdctx.Context, ctx *context.TeaContext, branch string) (int64, error) {
 	c := ctx.Login.Client()
 	opts := gitea.ListPullRequestsOptions{
 		State:       gitea.StateOpen,
@@ -54,7 +55,7 @@ func getPullIndex(ctx *context.TeaContext, branch string) (int64, error) {
 	var prs []*gitea.PullRequest
 	for {
 		var err error
-		prs, _, err = c.ListRepoPullRequests(ctx.Owner, ctx.Repo, opts)
+		prs, _, err = c.PullRequests.ListRepoPullRequests(requestCtx, ctx.Owner, ctx.Repo, opts)
 		if err != nil {
 			return 0, err
 		}

modules/interact/pull_review.go

@@ -4,11 +4,12 @@
 package interact
 
 import (
+	stdctx "context"
 	"fmt"
 	"os"
 	"strconv"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	"gitea.dev/tea/modules/context"
@@ -26,7 +27,7 @@ var reviewStates = map[string]gitea.ReviewStateType{
 var reviewStateOptions = []string{"comment", "request changes", "approve"}
 
 // ReviewPull interactively reviews a PR
-func ReviewPull(ctx *context.TeaContext, idx int64) error {
+func ReviewPull(requestCtx stdctx.Context, ctx *context.TeaContext, idx int64) error {
 	var state gitea.ReviewStateType
 	var comment string
 	var codeComments []gitea.CreatePullReviewComment
@@ -44,7 +45,7 @@ func ReviewPull(ctx *context.TeaContext, idx int64) error {
 	printTitleAndContent("Review / comment the diff?", strconv.FormatBool(reviewDiff))
 
 	if reviewDiff {
-		if codeComments, err = DoDiffReview(ctx, idx); err != nil {
+		if codeComments, err = DoDiffReview(requestCtx, ctx, idx); err != nil {
 			fmt.Printf("Error during diff review: %s\n", err)
 		}
 		fmt.Printf("Found %d code comments in your review\n", len(codeComments))
@@ -78,14 +79,14 @@ func ReviewPull(ctx *context.TeaContext, idx int64) error {
 	}
 	printTitleAndContent("Concluding comment(markdown):", comment)
 
-	return task.CreatePullReview(ctx, idx, state, comment, codeComments)
+	return task.CreatePullReview(requestCtx, ctx, idx, state, comment, codeComments)
 }
 
 // DoDiffReview (1) fetches & saves diff in tempfile, (2) starts $VISUAL or $EDITOR to comment on diff,
 // (3) parses resulting file into code comments.
 // It doesn't really make sense to use survey.Editor() here, as we'd read the file content at least twice.
-func DoDiffReview(ctx *context.TeaContext, idx int64) ([]gitea.CreatePullReviewComment, error) {
-	tmpFile, err := task.SavePullDiff(ctx, idx)
+func DoDiffReview(requestCtx stdctx.Context, ctx *context.TeaContext, idx int64) ([]gitea.CreatePullReviewComment, error) {
+	tmpFile, err := task.SavePullDiff(requestCtx, ctx, idx)
 	if err != nil {
 		return nil, err
 	}

modules/print/actions.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // ActionSecretsList prints a list of action secrets

modules/print/actions_runs.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // formatDurationMinutes formats duration in a human-readable way

modules/print/actions_runs_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/stretchr/testify/require"
 )
 

modules/print/actions_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/stretchr/testify/require"
 )
 

modules/print/attachment.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 func formatByteSize(size int64) string {

modules/print/branch.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // BranchesList prints a listing of the branches

modules/print/branch_test.go

@@ -6,7 +6,7 @@ package print
 import (
 	"testing"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/stretchr/testify/assert"
 )
 

modules/print/comment.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // Comments renders a list of comments to stdout

modules/print/formatters.go

@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/muesli/termenv"
 	"golang.org/x/term"
 )

modules/print/issue.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/enescakir/emoji"
 )
 

modules/print/label.go

@@ -6,7 +6,7 @@ package print
 import (
 	"strconv"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // LabelsList prints a listing of labels

modules/print/milestone.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // MilestoneDetails print an milestone formatted to stdout

modules/print/notification.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // NotificationsList prints a listing of notification threads

modules/print/organization.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // OrganizationDetails prints details of an org with formatting

modules/print/pull.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 var ciStatusSymbols = map[gitea.StatusState]string{

modules/print/pull_review_comment.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // PullReviewCommentFields are all available fields to print with PullReviewCommentsList()

modules/print/pull_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

modules/print/release.go

@@ -4,7 +4,7 @@
 package print
 
 import (
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // ReleasesList prints a listing of releases

modules/print/repo.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // ReposList prints a listing of the repos

modules/print/repo_test.go

@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/stretchr/testify/require"
 )
 

modules/print/sshkey.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // SSHKeysList prints a table of SSH public keys

modules/print/times.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // TrackedTimesList print list of tracked times to stdout

modules/print/user.go

@@ -6,7 +6,7 @@ package print
 import (
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // UserDetails print a formatted user to stdout

modules/print/webhook.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // WebhooksList prints a listing of webhooks

modules/print/webhook_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"github.com/stretchr/testify/assert"
 )
 

modules/task/issue_create.go

@@ -4,22 +4,23 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	"gitea.dev/tea/modules/print"
 )
 
 // CreateIssue creates an issue in the given repo and prints the result
-func CreateIssue(login *config.Login, repoOwner, repoName string, opts gitea.CreateIssueOption) error {
+func CreateIssue(requestCtx stdctx.Context, rlogin *config.Login, repoOwner, repoName string, opts gitea.CreateIssueOption) error {
 	// title is required
 	if len(opts.Title) == 0 {
 		return fmt.Errorf("title is required")
 	}
 
-	issue, _, err := login.Client().CreateIssue(repoOwner, repoName, opts)
+	issue, _, err := rlogin.Client().Issues.CreateIssue(requestCtx, repoOwner, repoName, opts)
 	if err != nil {
 		return fmt.Errorf("could not create issue: %s", err)
 	}

modules/task/issue_edit.go

@@ -4,10 +4,11 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/context"
 )
@@ -30,12 +31,12 @@ type EditIssueOption struct {
 
 // Normalizes the options into parameters that can be passed to the sdk.
 // the returned value will be nil, when no change to this part of the issue is requested.
-func (o EditIssueOption) toSdkOptions(ctx *context.TeaContext, client *gitea.Client) (*gitea.EditIssueOption, *gitea.IssueLabelsOption, *gitea.IssueLabelsOption, error) {
-	addLabelOpts, err := ResolveLabelOpts(client, ctx.Owner, ctx.Repo, o.AddLabels)
+func (o EditIssueOption) toSdkOptions(requestCtx stdctx.Context, ctx *context.TeaContext, client *gitea.Client) (*gitea.EditIssueOption, *gitea.IssueLabelsOption, *gitea.IssueLabelsOption, error) {
+	addLabelOpts, err := ResolveLabelOpts(requestCtx, client, ctx.Owner, ctx.Repo, o.AddLabels)
 	if err != nil {
 		return nil, nil, nil, err
 	}
-	rmLabelOpts, err := ResolveLabelOpts(client, ctx.Owner, ctx.Repo, o.RemoveLabels)
+	rmLabelOpts, err := ResolveLabelOpts(requestCtx, client, ctx.Owner, ctx.Repo, o.RemoveLabels)
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -55,7 +56,7 @@ func (o EditIssueOption) toSdkOptions(ctx *context.TeaContext, client *gitea.Cli
 		issueOptsDirty = true
 	}
 	if o.Milestone != nil {
-		id, err := ResolveMilestoneID(client, ctx.Owner, ctx.Repo, *o.Milestone)
+		id, err := ResolveMilestoneID(requestCtx, client, ctx.Owner, ctx.Repo, *o.Milestone)
 		if err != nil {
 			return nil, nil, nil, err
 		}
@@ -81,28 +82,28 @@ func (o EditIssueOption) toSdkOptions(ctx *context.TeaContext, client *gitea.Cli
 }
 
 // EditIssue edits an issue and returns the updated issue.
-func EditIssue(ctx *context.TeaContext, client *gitea.Client, opts EditIssueOption) (*gitea.Issue, error) {
+func EditIssue(requestCtx stdctx.Context, ctx *context.TeaContext, client *gitea.Client, opts EditIssueOption) (*gitea.Issue, error) {
 	if client == nil {
 		client = ctx.Login.Client()
 	}
 
-	issueOpts, addLabelOpts, rmLabelOpts, err := opts.toSdkOptions(ctx, client)
+	issueOpts, addLabelOpts, rmLabelOpts, err := opts.toSdkOptions(requestCtx, ctx, client)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := ApplyLabelChanges(client, ctx.Owner, ctx.Repo, opts.Index, addLabelOpts, rmLabelOpts); err != nil {
+	if err := ApplyLabelChanges(requestCtx, client, ctx.Owner, ctx.Repo, opts.Index, addLabelOpts, rmLabelOpts); err != nil {
 		return nil, err
 	}
 
 	var issue *gitea.Issue
 	if issueOpts != nil {
-		issue, _, err = client.EditIssue(ctx.Owner, ctx.Repo, opts.Index, *issueOpts)
+		issue, _, err = client.Issues.EditIssue(requestCtx, ctx.Owner, ctx.Repo, opts.Index, *issueOpts)
 		if err != nil {
 			return nil, fmt.Errorf("could not edit issue: %s", err)
 		}
 	} else {
-		issue, _, err = client.GetIssue(ctx.Owner, ctx.Repo, opts.Index)
+		issue, _, err = client.Issues.GetIssue(requestCtx, ctx.Owner, ctx.Repo, opts.Index)
 		if err != nil {
 			return nil, fmt.Errorf("could not get issue: %s", err)
 		}

modules/task/labels.go

@@ -4,19 +4,20 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/utils"
 )
 
 // ResolveLabelNames returns a list of label IDs for a given list of label names
-func ResolveLabelNames(client *gitea.Client, owner, repo string, labelNames []string) ([]int64, error) {
+func ResolveLabelNames(requestCtx stdctx.Context, client *gitea.Client, owner, repo string, labelNames []string) ([]int64, error) {
 	labelIDs := make([]int64, 0, len(labelNames))
 	page := 1
 	for {
-		labels, resp, err := client.ListRepoLabels(owner, repo, gitea.ListLabelsOptions{
+		labels, resp, err := client.Repositories.ListRepoLabels(requestCtx, owner, repo, gitea.ListLabelsOptions{
 			ListOptions: gitea.ListOptions{Page: page, PageSize: 50},
 		})
 		if err != nil {
@@ -36,11 +37,11 @@ func ResolveLabelNames(client *gitea.Client, owner, repo string, labelNames []st
 }
 
 // ResolveLabelOpts resolves label names to IssueLabelsOption. Returns nil if names is empty.
-func ResolveLabelOpts(client *gitea.Client, owner, repo string, names []string) (*gitea.IssueLabelsOption, error) {
+func ResolveLabelOpts(requestCtx stdctx.Context, client *gitea.Client, owner, repo string, names []string) (*gitea.IssueLabelsOption, error) {
 	if len(names) == 0 {
 		return nil, nil
 	}
-	ids, err := ResolveLabelNames(client, owner, repo, names)
+	ids, err := ResolveLabelNames(requestCtx, client, owner, repo, names)
 	if err != nil {
 		return nil, err
 	}
@@ -48,18 +49,18 @@ func ResolveLabelOpts(client *gitea.Client, owner, repo string, names []string)
 }
 
 // ApplyLabelChanges adds and removes labels on an issue or pull request.
-func ApplyLabelChanges(client *gitea.Client, owner, repo string, index int64, add, rm *gitea.IssueLabelsOption) error {
+func ApplyLabelChanges(requestCtx stdctx.Context, client *gitea.Client, owner, repo string, index int64, add, rm *gitea.IssueLabelsOption) error {
 	if rm != nil {
 		// NOTE: as of 1.17, there is no API to remove multiple labels at once.
 		for _, id := range rm.Labels {
-			_, err := client.DeleteIssueLabel(owner, repo, index, id)
+			_, err := client.Issues.DeleteIssueLabel(requestCtx, owner, repo, index, id)
 			if err != nil {
 				return fmt.Errorf("could not remove labels: %s", err)
 			}
 		}
 	}
 	if add != nil {
-		_, _, err := client.AddIssueLabels(owner, repo, index, *add)
+		_, _, err := client.Issues.AddIssueLabels(requestCtx, owner, repo, index, *add)
 		if err != nil {
 			return fmt.Errorf("could not add labels: %s", err)
 		}
@@ -68,9 +69,9 @@ func ApplyLabelChanges(client *gitea.Client, owner, repo string, index int64, ad
 }
 
 // ApplyReviewerChanges adds and removes reviewers on a pull request.
-func ApplyReviewerChanges(client *gitea.Client, owner, repo string, index int64, add, rm []string) error {
+func ApplyReviewerChanges(requestCtx stdctx.Context, client *gitea.Client, owner, repo string, index int64, add, rm []string) error {
 	if len(rm) != 0 {
-		_, err := client.DeleteReviewRequests(owner, repo, index, gitea.PullReviewRequestOptions{
+		_, err := client.PullRequests.DeleteReviewRequests(requestCtx, owner, repo, index, gitea.PullReviewRequestOptions{
 			Reviewers: rm,
 		})
 		if err != nil {
@@ -78,7 +79,7 @@ func ApplyReviewerChanges(client *gitea.Client, owner, repo string, index int64,
 		}
 	}
 	if len(add) != 0 {
-		_, err := client.CreateReviewRequests(owner, repo, index, gitea.PullReviewRequestOptions{
+		_, err := client.PullRequests.CreateReviewRequests(requestCtx, owner, repo, index, gitea.PullReviewRequestOptions{
 			Reviewers: add,
 		})
 		if err != nil {
@@ -89,11 +90,11 @@ func ApplyReviewerChanges(client *gitea.Client, owner, repo string, index int64,
 }
 
 // ResolveMilestoneID resolves a milestone name to its ID. Returns 0 for empty name.
-func ResolveMilestoneID(client *gitea.Client, owner, repo, name string) (int64, error) {
+func ResolveMilestoneID(requestCtx stdctx.Context, client *gitea.Client, owner, repo, name string) (int64, error) {
 	if name == "" {
 		return 0, nil
 	}
-	ms, _, err := client.GetMilestoneByName(owner, repo, name)
+	ms, _, err := client.Repositories.GetMilestoneByName(requestCtx, owner, repo, name)
 	if err != nil {
 		return 0, fmt.Errorf("could not resolve milestone '%s': %w", name, err)
 	}

modules/task/labels_export.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 )
 
 // LabelsExport save list of labels to disc

modules/task/login_create.go

@@ -4,13 +4,14 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	"gitea.dev/tea/modules/utils"
@@ -48,7 +49,7 @@ func SetupHelper(login config.Login) (ok bool, err error) {
 }
 
 // CreateLogin create a login to be stored in config
-func CreateLogin(name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint string, insecure, sshAgent, versionCheck, addHelper bool) error {
+func CreateLogin(ctx stdctx.Context, name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint string, insecure, sshAgent, versionCheck, addHelper bool) error {
 	// checks ...
 	// ... if we have a url
 	if len(giteaURL) == 0 {
@@ -105,7 +106,7 @@ func CreateLogin(name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCe
 	}
 
 	if len(token) == 0 && sshCertPrincipal == "" && !sshAgent && sshKey == "" {
-		if login.Token, err = generateToken(login, user, passwd, otp, scopes); err != nil {
+		if login.Token, err = generateToken(ctx, login, user, passwd, otp, scopes); err != nil {
 			return err
 		}
 	}
@@ -113,7 +114,7 @@ func CreateLogin(name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCe
 	client := login.Client()
 
 	// Verify if authentication works and get user info
-	u, _, err := client.GetMyUserInfo()
+	u, _, err := client.Users.GetMyUserInfo(ctx)
 	if err != nil {
 		return err
 	}
@@ -130,7 +131,7 @@ func CreateLogin(name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCe
 	login.SSHHost = serverURL.Host
 
 	if len(sshKey) == 0 {
-		login.SSHKey, err = findSSHKey(client)
+		login.SSHKey, err = findSSHKey(ctx, client)
 		if err != nil {
 			fmt.Printf("Warning: problem while finding a SSH key: %s\n", err)
 		}
@@ -159,7 +160,7 @@ func shouldCheckTokenUniqueness(token string, sshAgent bool, sshKey, sshCertPrin
 }
 
 // generateToken creates a new token when given BasicAuth credentials
-func generateToken(login config.Login, user, pass, otp, scopes string) (string, error) {
+func generateToken(ctx stdctx.Context, login config.Login, user, pass, otp, scopes string) (string, error) {
 	opts := []gitea.ClientOption{gitea.SetBasicAuth(user, pass)}
 	if otp != "" {
 		opts = append(opts, gitea.SetOTP(otp))
@@ -168,7 +169,7 @@ func generateToken(login config.Login, user, pass, otp, scopes string) (string,
 
 	var tl []*gitea.AccessToken
 	for page := 1; ; {
-		page_tokens, resp, err := client.ListAccessTokens(gitea.ListAccessTokensOptions{
+		page_tokens, resp, err := client.Users.ListAccessTokens(ctx, gitea.ListAccessTokensOptions{
 			ListOptions: gitea.ListOptions{Page: page, PageSize: 50},
 		})
 		if err != nil {
@@ -200,7 +201,7 @@ func generateToken(login config.Login, user, pass, otp, scopes string) (string,
 		}
 	}
 
-	t, _, err := client.CreateAccessToken(gitea.CreateAccessTokenOption{
+	t, _, err := client.Users.CreateAccessToken(ctx, gitea.CreateAccessTokenOption{
 		Name:   tokenName,
 		Scopes: tokenScopes,
 	})

modules/task/login_httpsign.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	"gitea.dev/sdk"
 	"golang.org/x/crypto/ssh"
 
 	"gitea.dev/tea/modules/utils"

modules/task/login_ssh.go

@@ -4,12 +4,13 @@
 package task
 
 import (
+	stdctx "context"
 	"encoding/base64"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/utils"
 	"golang.org/x/crypto/ssh"
@@ -17,11 +18,11 @@ import (
 
 // findSSHKey retrieves the ssh keys registered in gitea, and tries to find
 // a matching private key in ~/.ssh/. If no match is found, path is empty.
-func findSSHKey(client *gitea.Client) (string, error) {
+func findSSHKey(ctx stdctx.Context, client *gitea.Client) (string, error) {
 	// get keys registered on gitea instance
 	var keys []*gitea.PublicKey
 	for page := 1; ; {
-		page_keys, resp, err := client.ListMyPublicKeys(gitea.ListPublicKeysOptions{
+		page_keys, resp, err := client.Users.ListMyPublicKeys(ctx, gitea.ListPublicKeysOptions{
 			ListOptions: gitea.ListOptions{Page: page, PageSize: 50},
 		})
 		if err != nil {

modules/task/milestone_create.go

@@ -4,23 +4,24 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 	"time"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	"gitea.dev/tea/modules/print"
 )
 
 // CreateMilestone creates a milestone in the given repo and prints the result
-func CreateMilestone(login *config.Login, repoOwner, repoName, title, description string, deadline *time.Time, state gitea.StateType) error {
+func CreateMilestone(ctx stdctx.Context, login *config.Login, repoOwner, repoName, title, description string, deadline *time.Time, state gitea.StateType) error {
 	// title is required
 	if len(title) == 0 {
 		return fmt.Errorf("title is required")
 	}
 
-	mile, _, err := login.Client().CreateMilestone(repoOwner, repoName, gitea.CreateMilestoneOption{
+	mile, _, err := login.Client().Repositories.CreateMilestone(ctx, repoOwner, repoName, gitea.CreateMilestoneOption{
 		Title:       title,
 		Description: description,
 		Deadline:    deadline,

modules/task/pull_checkout.go

@@ -4,9 +4,10 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	local_git "gitea.dev/tea/modules/git"
@@ -14,6 +15,7 @@ import (
 
 // PullCheckout checkout current workdir to the head branch of specified pull request
 func PullCheckout(
+	ctx stdctx.Context,
 	login *config.Login,
 	repoOwner, repoName string,
 	forceCreateBranch bool,
@@ -21,7 +23,7 @@ func PullCheckout(
 	callback func(string) (string, error),
 ) error {
 	client := login.Client()
-	pr, _, err := client.GetPullRequest(repoOwner, repoName, index)
+	pr, _, err := client.PullRequests.GetPullRequest(ctx, repoOwner, repoName, index)
 	if err != nil {
 		return fmt.Errorf("couldn't fetch PR: %s", err)
 	}

modules/task/pull_clean.go

@@ -4,19 +4,20 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	local_git "gitea.dev/tea/modules/git"
 )
 
 // PullClean deletes local & remote feature-branches for a closed pull
-func PullClean(login *config.Login, repoOwner, repoName string, index int64, ignoreSHA bool, callback func(string) (string, error)) error {
+func PullClean(ctx stdctx.Context, login *config.Login, repoOwner, repoName string, index int64, ignoreSHA bool, callback func(string) (string, error)) error {
 	client := login.Client()
 
-	repo, _, err := client.GetRepo(repoOwner, repoName)
+	repo, _, err := client.Repositories.GetRepo(ctx, repoOwner, repoName)
 	if err != nil {
 		return err
 	}
@@ -26,7 +27,7 @@ func PullClean(login *config.Login, repoOwner, repoName string, index int64, ign
 	}
 
 	// fetch PR source-repo & -branch from gitea
-	pr, _, err := client.GetPullRequest(repoOwner, repoName, index)
+	pr, _, err := client.PullRequests.GetPullRequest(ctx, repoOwner, repoName, index)
 	if err != nil {
 		return err
 	}

modules/task/pull_create.go

@@ -4,11 +4,12 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 	"regexp"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	"gitea.dev/tea/modules/context"
@@ -24,10 +25,10 @@ var (
 )
 
 // CreatePull creates a PR in the given repo and prints the result
-func CreatePull(ctx *context.TeaContext, base, head string, allowMaintainerEdits *bool, opts *gitea.CreateIssueOption) (err error) {
+func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext, base, head string, allowMaintainerEdits *bool, opts *gitea.CreateIssueOption) (err error) {
 	// default is default branch
 	if len(base) == 0 {
-		base, err = GetDefaultPRBase(ctx.Login, ctx.Owner, ctx.Repo)
+		base, err = GetDefaultPRBase(requestCtx, ctx.Login, ctx.Owner, ctx.Repo)
 		if err != nil {
 			return err
 		}
@@ -62,7 +63,7 @@ func CreatePull(ctx *context.TeaContext, base, head string, allowMaintainerEdits
 
 	client := ctx.Login.Client()
 
-	pr, _, err := client.CreatePullRequest(ctx.Owner, ctx.Repo, gitea.CreatePullRequestOption{
+	pr, _, err := client.PullRequests.CreatePullRequest(requestCtx, ctx.Owner, ctx.Repo, gitea.CreatePullRequestOption{
 		Head:      head,
 		Base:      base,
 		Title:     opts.Title,
@@ -77,7 +78,7 @@ func CreatePull(ctx *context.TeaContext, base, head string, allowMaintainerEdits
 	}
 
 	if allowMaintainerEdits != nil && pr.AllowMaintainerEdit != *allowMaintainerEdits {
-		pr, _, err = client.EditPullRequest(ctx.Owner, ctx.Repo, pr.Index, gitea.EditPullRequestOption{
+		pr, _, err = client.PullRequests.EditPullRequest(requestCtx, ctx.Owner, ctx.Repo, pr.Index, gitea.EditPullRequestOption{
 			AllowMaintainerEdit: allowMaintainerEdits,
 		})
 		if err != nil {
@@ -93,8 +94,8 @@ func CreatePull(ctx *context.TeaContext, base, head string, allowMaintainerEdits
 }
 
 // GetDefaultPRBase retrieves the default base branch for the given repo
-func GetDefaultPRBase(login *config.Login, owner, repo string) (string, error) {
-	meta, _, err := login.Client().GetRepo(owner, repo)
+func GetDefaultPRBase(requestCtx stdctx.Context, login *config.Login, owner, repo string) (string, error) {
+	meta, _, err := login.Client().Repositories.GetRepo(requestCtx, owner, repo)
 	if err != nil {
 		return "", fmt.Errorf("could not fetch repo meta: %s", err)
 	}
@@ -156,13 +157,13 @@ func GetDefaultPRTitle(header string) string {
 }
 
 // CreateAgitFlowPull creates a agit flow PR in the given repo and prints the result
-func CreateAgitFlowPull(ctx *context.TeaContext, remote, head, base, topic string,
+func CreateAgitFlowPull(requestCtx stdctx.Context, ctx *context.TeaContext, remote, head, base, topic string,
 	opts *gitea.CreateIssueOption,
 	callback func(string) (string, error),
 ) (err error) {
 	// default is default branch
 	if len(base) == 0 {
-		base, err = GetDefaultPRBase(ctx.Login, ctx.Owner, ctx.Repo)
+		base, err = GetDefaultPRBase(requestCtx, ctx.Login, ctx.Owner, ctx.Repo)
 		if err != nil {
 			return err
 		}

modules/task/pull_edit.go

@@ -4,24 +4,24 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
-
+	gitea "gitea.dev/sdk"
 	"gitea.dev/tea/modules/context"
 )
 
 // EditPull edits a pull request and returns the updated pull request.
-func EditPull(ctx *context.TeaContext, client *gitea.Client, opts EditIssueOption) (*gitea.PullRequest, error) {
+func EditPull(requestCtx stdctx.Context, ctx *context.TeaContext, client *gitea.Client, opts EditIssueOption) (*gitea.PullRequest, error) {
 	if client == nil {
 		client = ctx.Login.Client()
 	}
 
-	addLabelOpts, err := ResolveLabelOpts(client, ctx.Owner, ctx.Repo, opts.AddLabels)
+	addLabelOpts, err := ResolveLabelOpts(requestCtx, client, ctx.Owner, ctx.Repo, opts.AddLabels)
 	if err != nil {
 		return nil, err
 	}
-	rmLabelOpts, err := ResolveLabelOpts(client, ctx.Owner, ctx.Repo, opts.RemoveLabels)
+	rmLabelOpts, err := ResolveLabelOpts(requestCtx, client, ctx.Owner, ctx.Repo, opts.RemoveLabels)
 	if err != nil {
 		return nil, err
 	}
@@ -37,7 +37,7 @@ func EditPull(ctx *context.TeaContext, client *gitea.Client, opts EditIssueOptio
 		prOptsDirty = true
 	}
 	if opts.Milestone != nil {
-		id, err := ResolveMilestoneID(client, ctx.Owner, ctx.Repo, *opts.Milestone)
+		id, err := ResolveMilestoneID(requestCtx, client, ctx.Owner, ctx.Repo, *opts.Milestone)
 		if err != nil {
 			return nil, err
 		}
@@ -56,22 +56,22 @@ func EditPull(ctx *context.TeaContext, client *gitea.Client, opts EditIssueOptio
 		prOptsDirty = true
 	}
 
-	if err := ApplyLabelChanges(client, ctx.Owner, ctx.Repo, opts.Index, addLabelOpts, rmLabelOpts); err != nil {
+	if err := ApplyLabelChanges(requestCtx, client, ctx.Owner, ctx.Repo, opts.Index, addLabelOpts, rmLabelOpts); err != nil {
 		return nil, err
 	}
 
-	if err := ApplyReviewerChanges(client, ctx.Owner, ctx.Repo, opts.Index, opts.AddReviewers, opts.RemoveReviewers); err != nil {
+	if err := ApplyReviewerChanges(requestCtx, client, ctx.Owner, ctx.Repo, opts.Index, opts.AddReviewers, opts.RemoveReviewers); err != nil {
 		return nil, err
 	}
 
 	var pr *gitea.PullRequest
 	if prOptsDirty {
-		pr, _, err = client.EditPullRequest(ctx.Owner, ctx.Repo, opts.Index, prOpts)
+		pr, _, err = client.PullRequests.EditPullRequest(requestCtx, ctx.Owner, ctx.Repo, opts.Index, prOpts)
 		if err != nil {
 			return nil, fmt.Errorf("could not edit pull request: %s", err)
 		}
 	} else {
-		pr, _, err = client.GetPullRequest(ctx.Owner, ctx.Repo, opts.Index)
+		pr, _, err = client.PullRequests.GetPullRequest(requestCtx, ctx.Owner, ctx.Repo, opts.Index)
 		if err != nil {
 			return nil, fmt.Errorf("could not get pull request: %s", err)
 		}

modules/task/pull_merge.go

@@ -4,17 +4,18 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 )
 
 // PullMerge merges a PR
-func PullMerge(login *config.Login, repoOwner, repoName string, index int64, opt gitea.MergePullRequestOption) error {
+func PullMerge(requestCtx stdctx.Context, login *config.Login, repoOwner, repoName string, index int64, opt gitea.MergePullRequestOption) error {
 	client := login.Client()
-	success, _, err := client.MergePullRequest(repoOwner, repoName, index, opt)
+	success, _, err := client.PullRequests.MergePullRequest(requestCtx, repoOwner, repoName, index, opt)
 	if err != nil {
 		return err
 	}

modules/task/pull_review.go

@@ -4,12 +4,13 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	unidiff "gitea.com/noerw/unidiff-comments"
 	"gitea.dev/tea/modules/context"
@@ -28,10 +29,10 @@ var diffReviewHelp = `# This is the current diff of PR #%d on %s.
 `
 
 // CreatePullReview submits a review for a PR
-func CreatePullReview(ctx *context.TeaContext, idx int64, status gitea.ReviewStateType, comment string, codeComments []gitea.CreatePullReviewComment) error {
+func CreatePullReview(requestCtx stdctx.Context, ctx *context.TeaContext, idx int64, status gitea.ReviewStateType, comment string, codeComments []gitea.CreatePullReviewComment) error {
 	c := ctx.Login.Client()
 
-	review, _, err := c.CreatePullReview(ctx.Owner, ctx.Repo, idx, gitea.CreatePullReviewOptions{
+	review, _, err := c.PullRequests.CreatePullReview(requestCtx, ctx.Owner, ctx.Repo, idx, gitea.CreatePullReviewOptions{
 		State:    status,
 		Body:     comment,
 		Comments: codeComments,
@@ -46,8 +47,8 @@ func CreatePullReview(ctx *context.TeaContext, idx int64, status gitea.ReviewSta
 
 // SavePullDiff fetches the diff of a pull request and stores it as a temporary file.
 // The path to the file is returned.
-func SavePullDiff(ctx *context.TeaContext, idx int64) (string, error) {
-	diff, _, err := ctx.Login.Client().GetPullRequestDiff(ctx.Owner, ctx.Repo, idx, gitea.PullRequestDiffOptions{})
+func SavePullDiff(requestCtx stdctx.Context, ctx *context.TeaContext, idx int64) (string, error) {
+	diff, _, err := ctx.Login.Client().PullRequests.GetPullRequestDiff(requestCtx, ctx.Owner, ctx.Repo, idx, gitea.PullRequestDiffOptions{})
 	if err != nil {
 		return "", err
 	}

modules/task/pull_review_comment.go

@@ -4,20 +4,21 @@
 package task
 
 import (
+	stdctx "context"
 	"fmt"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/context"
 )
 
 // ListPullReviewComments lists all review comments across all reviews for a PR
-func ListPullReviewComments(ctx *context.TeaContext, idx int64) ([]*gitea.PullReviewComment, error) {
+func ListPullReviewComments(requestCtx stdctx.Context, ctx *context.TeaContext, idx int64) ([]*gitea.PullReviewComment, error) {
 	c := ctx.Login.Client()
 
 	var reviews []*gitea.PullReview
 	for page := 1; ; {
-		page_reviews, resp, err := c.ListPullReviews(ctx.Owner, ctx.Repo, idx, gitea.ListPullReviewsOptions{
+		page_reviews, resp, err := c.PullRequests.ListPullReviews(requestCtx, ctx.Owner, ctx.Repo, idx, gitea.ListPullReviewsOptions{
 			ListOptions: gitea.ListOptions{Page: page, PageSize: 50},
 		})
 		if err != nil {
@@ -32,7 +33,7 @@ func ListPullReviewComments(ctx *context.TeaContext, idx int64) ([]*gitea.PullRe
 
 	var allComments []*gitea.PullReviewComment
 	for _, review := range reviews {
-		comments, _, err := c.ListPullReviewComments(ctx.Owner, ctx.Repo, idx, review.ID)
+		comments, _, err := c.PullRequests.ListPullReviewComments(requestCtx, ctx.Owner, ctx.Repo, idx, review.ID)
 		if err != nil {
 			return nil, err
 		}
@@ -43,10 +44,10 @@ func ListPullReviewComments(ctx *context.TeaContext, idx int64) ([]*gitea.PullRe
 }
 
 // ResolvePullReviewComment resolves a review comment
-func ResolvePullReviewComment(ctx *context.TeaContext, commentID int64) error {
+func ResolvePullReviewComment(requestCtx stdctx.Context, ctx *context.TeaContext, commentID int64) error {
 	c := ctx.Login.Client()
 
-	_, err := c.ResolvePullReviewComment(ctx.Owner, ctx.Repo, commentID)
+	_, err := c.PullRequests.ResolvePullReviewComment(requestCtx, ctx.Owner, ctx.Repo, commentID)
 	if err != nil {
 		return err
 	}
@@ -56,10 +57,10 @@ func ResolvePullReviewComment(ctx *context.TeaContext, commentID int64) error {
 }
 
 // UnresolvePullReviewComment unresolves a review comment
-func UnresolvePullReviewComment(ctx *context.TeaContext, commentID int64) error {
+func UnresolvePullReviewComment(requestCtx stdctx.Context, ctx *context.TeaContext, commentID int64) error {
 	c := ctx.Login.Client()
 
-	_, err := c.UnresolvePullReviewComment(ctx.Owner, ctx.Repo, commentID)
+	_, err := c.PullRequests.UnresolvePullReviewComment(requestCtx, ctx.Owner, ctx.Repo, commentID)
 	if err != nil {
 		return err
 	}

modules/task/repo_clone.go

@@ -4,9 +4,10 @@
 package task
 
 import (
+	stdctx "context"
 	"net/url"
 
-	"code.gitea.io/sdk/gitea"
+	gitea "gitea.dev/sdk"
 
 	"gitea.dev/tea/modules/config"
 	local_git "gitea.dev/tea/modules/git"
@@ -15,13 +16,14 @@ import (
 // RepoClone creates a local git clone in the given path, and sets up upstream remote
 // for fork repos, for good usability with tea.
 func RepoClone(
+	ctx stdctx.Context,
 	path string,
 	login *config.Login,
 	repoOwner, repoName string,
 	callback func(string) (string, error),
 	depth int,
 ) (*local_git.TeaRepo, error) {
-	repoMeta, _, err := login.Client().GetRepo(repoOwner, repoName)
+	repoMeta, _, err := login.Client().Repositories.GetRepo(ctx, repoOwner, repoName)
 	if err != nil {
 		return nil, err
 	}