From 086fb48d31be4a58872b3a4307441613bd10eb53 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Thu, 23 Jul 2020 11:25:31 -0500
Subject: [PATCH] move displayURL

---
 command/issue.go          | 14 +++-----------
 command/pr.go             |  2 +-
 command/pr_create.go      |  2 +-
 pkg/cmd/repo/view/view.go | 11 +----------
 utils/utils.go            |  9 +++++++++
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/command/issue.go b/command/issue.go
index 0bc870dcc..43049faa2 100644
--- a/command/issue.go
+++ b/command/issue.go
@@ -240,7 +240,7 @@ func issueList(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		return utils.OpenInBrowser(openURL)
 	}
 
@@ -518,7 +518,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 			openURL += "/choose"
 		}
 		if connectedToTerminal(cmd) {
-			cmd.Printf("Opening %s in your browser.\n", displayURL(openURL))
+			cmd.Printf("Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		}
 		return utils.OpenInBrowser(openURL)
 	}
@@ -592,7 +592,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 			return err
 		}
 		// TODO could exceed max url length for explorer
-		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		return utils.OpenInBrowser(openURL)
 	} else if action == SubmitAction {
 		params := map[string]interface{}{
@@ -836,11 +836,3 @@ func issueReopen(cmd *cobra.Command, args []string) error {
 
 	return nil
 }
-
-func displayURL(urlStr string) string {
-	u, err := url.Parse(urlStr)
-	if err != nil {
-		return urlStr
-	}
-	return u.Hostname() + u.Path
-}
diff --git a/command/pr.go b/command/pr.go
index 6d276d833..2ef865066 100644
--- a/command/pr.go
+++ b/command/pr.go
@@ -246,7 +246,7 @@ func prList(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		return utils.OpenInBrowser(openURL)
 	}
 
diff --git a/command/pr_create.go b/command/pr_create.go
index 97dc018d1..b9efca0fa 100644
--- a/command/pr_create.go
+++ b/command/pr_create.go
@@ -367,7 +367,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {
 		}
 		if connectedToTerminal(cmd) {
 			// TODO could exceed max url length for explorer
-			fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+			fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		}
 		return utils.OpenInBrowser(openURL)
 	} else {
diff --git a/pkg/cmd/repo/view/view.go b/pkg/cmd/repo/view/view.go
index b4c0436d9..eed90a9ad 100644
--- a/pkg/cmd/repo/view/view.go
+++ b/pkg/cmd/repo/view/view.go
@@ -100,7 +100,7 @@ func viewRun(opts *ViewOptions) error {
 	openURL := ghrepo.GenerateRepoURL(toView, "")
 	if opts.Web {
 		if opts.IO.IsStdoutTTY() {
-			fmt.Fprintf(opts.IO.ErrOut, "Opening %s in your browser.\n", displayURL(openURL))
+			fmt.Fprintf(opts.IO.ErrOut, "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		}
 		return utils.OpenInBrowser(openURL)
 	}
@@ -186,12 +186,3 @@ func isMarkdownFile(filename string) bool {
 		strings.HasSuffix(filename, ".mdown") ||
 		strings.HasSuffix(filename, ".mkdown")
 }
-
-// TODO COPYPASTA FROM command; CONSIDER FOR cmdutil?
-func displayURL(urlStr string) string {
-	u, err := url.Parse(urlStr)
-	if err != nil {
-		return urlStr
-	}
-	return u.Hostname() + u.Path
-}
diff --git a/utils/utils.go b/utils/utils.go
index ca011b9f3..c03d6ccf3 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"fmt"
 	"io"
+	"net/url"
 	"strings"
 	"time"
 
@@ -106,3 +107,11 @@ func Spinner(w io.Writer) *spinner.Spinner {
 func IsURL(s string) bool {
 	return strings.HasPrefix(s, "http:/") || strings.HasPrefix(s, "https:/")
 }
+
+func DisplayURL(urlStr string) string {
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return urlStr
+	}
+	return u.Hostname() + u.Path
+}