modules/interact/issue_create.go

@@ -7,7 +7,6 @@ package interact
 import (
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/task"
-	"code.gitea.io/tea/modules/utils"
 
 	"github.com/AlecAivazis/survey/v2"
 )
@@ -17,7 +16,7 @@ func CreateIssue(login *config.Login, owner, repo string) error {
 	var title, description string
 
 	// owner, repo
-	owner, repo, err := utils.PromptRepoSlug(owner, repo)
+	owner, repo, err := PromptRepoSlug(owner, repo)
 	if err != nil {
 		return err
 	}

modules/interact/prompts.go

@@ -5,6 +5,9 @@
 package interact
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/AlecAivazis/survey/v2"
 )
 
@@ -14,3 +17,43 @@ func PromptPassword(name string) (pass string, err error) {
 	err = survey.AskOne(promptPW, &pass, survey.WithValidator(survey.Required))
 	return
 }
+
+// PromptRepoSlug interactively prompts for a Gitea repository or returns the current one
+func PromptRepoSlug(defaultOwner, defaultRepo string) (owner, repo string, err error) {
+	prompt := "Target repo:"
+	required := true
+	if len(defaultOwner) != 0 && len(defaultRepo) != 0 {
+		prompt = fmt.Sprintf("Target repo [%s/%s]:", defaultOwner, defaultRepo)
+		required = false
+	}
+	var repoSlug string
+
+	owner = defaultOwner
+	repo = defaultRepo
+
+	err = survey.AskOne(
+		&survey.Input{Message: prompt},
+		&repoSlug,
+		survey.WithValidator(func(input interface{}) error {
+			if str, ok := input.(string); ok {
+				if !required && len(str) == 0 {
+					return nil
+				}
+				split := strings.Split(str, "/")
+				if len(split) != 2 || len(split[0]) == 0 || len(split[1]) == 0 {
+					return fmt.Errorf("must follow the <owner>/<repo> syntax")
+				}
+			} else {
+				return fmt.Errorf("invalid result type")
+			}
+			return nil
+		}),
+	)
+
+	if err == nil && len(repoSlug) != 0 {
+		repoSlugSplit := strings.Split(repoSlug, "/")
+		owner = repoSlugSplit[0]
+		repo = repoSlugSplit[1]
+	}
+	return
+}

modules/interact/pull_create.go

@@ -8,7 +8,6 @@ import (
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/git"
 	"code.gitea.io/tea/modules/task"
-	"code.gitea.io/tea/modules/utils"
 
 	"github.com/AlecAivazis/survey/v2"
 )
@@ -18,7 +17,7 @@ func CreatePull(login *config.Login, owner, repo string) error {
 	var base, head, title, description string
 
 	// owner, repo
-	owner, repo, err := utils.PromptRepoSlug(owner, repo)
+	owner, repo, err := PromptRepoSlug(owner, repo)
 	if err != nil {
 		return err
 	}

modules/utils/prompts.go

@@ -1,52 +0,0 @@
-// Copyright 2020 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package utils
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/AlecAivazis/survey/v2"
-)
-
-// PromptRepoSlug interactively prompts for a Gitea repository or returns the current one
-func PromptRepoSlug(defaultOwner, defaultRepo string) (owner, repo string, err error) {
-	prompt := "Target repo:"
-	required := true
-	if len(defaultOwner) != 0 && len(defaultRepo) != 0 {
-		prompt = fmt.Sprintf("Target repo [%s/%s]:", defaultOwner, defaultRepo)
-		required = false
-	}
-	var repoSlug string
-
-	owner = defaultOwner
-	repo = defaultRepo
-
-	err = survey.AskOne(
-		&survey.Input{Message: prompt},
-		&repoSlug,
-		survey.WithValidator(func(input interface{}) error {
-			if str, ok := input.(string); ok {
-				if !required && len(str) == 0 {
-					return nil
-				}
-				split := strings.Split(str, "/")
-				if len(split) != 2 || len(split[0]) == 0 || len(split[1]) == 0 {
-					return fmt.Errorf("must follow the <owner>/<repo> syntax")
-				}
-			} else {
-				return fmt.Errorf("invalid result type")
-			}
-			return nil
-		}),
-	)
-
-	if err == nil && len(repoSlug) != 0 {
-		repoSlugSplit := strings.Split(repoSlug, "/")
-		owner = repoSlugSplit[0]
-		repo = repoSlugSplit[1]
-	}
-	return
-}