Respect share_url config

Author: juho05

README.md

@@ -70,12 +70,12 @@ Remove a session:
 codegame session remove
 ```
 
-Export a session to *share.code-game.org*:
+Export a session to [CodeGame Share](https://share.code-game.org):
 ```
 codegame session export
 ```
 
-Import a session from *share.code-game.org*:
+Import a session from [CodeGame Share](https://share.code-game.org):
 ```
 codegame session import <id>
 ```
@@ -92,7 +92,7 @@ Create a new game on a server:
 codegame game create <url>
 ```
 
-### Sharing
+### Sharing with [CodeGame Share](https://share.code-game.org)
 
 Share a game:
 ```

cmd/session.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"os"
 
 	"github.com/Bananenpro/cli"
@@ -26,12 +27,17 @@ func selectSession(args []string) (sessions.Session, error) {
 
 	if gameURL == "" {
 		urls, err := sessions.ListGames()
+		if len(urls) == 0 {
+			abort(errors.New("no sessions available"))
+		}
 		if err != nil {
 			gameURL, err = cli.Input("Game URL:")
 		} else {
 			var index int
 			index, err = cli.Select("Game URL:", urls)
-			gameURL = urls[index]
+			if err == nil {
+				gameURL = urls[index]
+			}
 		}
 		if err != nil {
 			os.Exit(0)
@@ -40,12 +46,17 @@ func selectSession(args []string) (sessions.Session, error) {
 
 	if username == "" {
 		usernames, err := sessions.ListUsernames(gameURL)
+		if len(usernames) == 0 {
+			abort(errors.New("no sessions available"))
+		}
 		if err != nil {
 			username, err = cli.Input("Username:")
 		} else {
 			var index int
 			index, err = cli.Select("Username:", usernames)
-			username = usernames[index]
+			if err == nil {
+				username = usernames[index]
+			}
 		}
 		if err != nil {
 			os.Exit(0)

cmd/session_export.go

@@ -7,7 +7,7 @@ import (
 // sessionExportCmd represents the session export command
 var sessionExportCmd = &cobra.Command{
 	Use:   "export",
-	Short: "Export a session to share.code-game.org (same as 'codegame share session').",
+	Short: "Export a session to CodeGame Share (same as 'codegame share session').",
 	Args:  cobra.RangeArgs(0, 2),
 	Run: func(cmd *cobra.Command, args []string) {
 		shareSessionCmd.Run(cmd, args)

cmd/session_import.go

@@ -6,14 +6,16 @@ import (
 	"net/http"
 
 	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/go-utils/config"
+	"github.com/code-game-project/go-utils/external"
 	"github.com/code-game-project/go-utils/sessions"
 	"github.com/spf13/cobra"
 )
 
 // sessionImportCmd represents the session import command
 var sessionImportCmd = &cobra.Command{
 	Use:   "import",
-	Short: "Import a session from share.code-game.org.",
+	Short: "Import a session from CodeGame Share.",
 	Args:  cobra.RangeArgs(0, 1),
 	Run: func(cmd *cobra.Command, args []string) {
 		var id string
@@ -27,8 +29,12 @@ var sessionImportCmd = &cobra.Command{
 			}
 		}
 
-		resp, err := http.Get(fmt.Sprintf("https://share.code-game.org/%s?type=session", id))
-		abortf("Failed to contact share.code-game.org: %s", err)
+		conf := config.Load()
+		shareURL := external.TrimURL(conf.ShareURL)
+		baseURL := external.BaseURL("http", external.IsTLS(shareURL), shareURL)
+
+		resp, err := http.Get(fmt.Sprintf(baseURL+"/%s?type=session", id))
+		abortf(fmt.Sprintf("Failed to contact %s: %s", conf.ShareURL, "%s"), err)
 
 		type resSession struct {
 			GameId       string `json:"game_id"`

cmd/share.go

@@ -8,7 +8,7 @@ import (
 // shareCmd represents the share command
 var shareCmd = &cobra.Command{
 	Use:   "share",
-	Short: "A CLI for share.code-game.org.",
+	Short: "A CLI for CodeGame Share.",
 }
 
 func findGameURL() string {

cmd/share_game.go

@@ -6,6 +6,8 @@ import (
 	"net/http"
 
 	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/go-utils/config"
+	"github.com/code-game-project/go-utils/external"
 	"github.com/code-game-project/go-utils/sessions"
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
@@ -14,7 +16,7 @@ import (
 // shareGameCmd represents the share game command
 var shareGameCmd = &cobra.Command{
 	Use:   "game",
-	Short: "Share a game with share.code-game.org.",
+	Short: "Share a game with CodeGame Share.",
 	Args:  cobra.RangeArgs(0, 2),
 	Run: func(cmd *cobra.Command, args []string) {
 		var gameURL string
@@ -94,7 +96,11 @@ var shareGameCmd = &cobra.Command{
 		jsonData, err := json.Marshal(data)
 		abort(err)
 
-		resp, err := http.Post("https://share.code-game.org/game", "application/json", bytes.NewBuffer(jsonData))
+		conf := config.Load()
+		shareURL := external.TrimURL(conf.ShareURL)
+		baseURL := external.BaseURL("http", external.IsTLS(shareURL), shareURL)
+
+		resp, err := http.Post(baseURL+"/game", "application/json", bytes.NewBuffer(jsonData))
 		if err != nil {
 			cli.Error("Failed to upload data: %s", err)
 			return
@@ -116,7 +122,7 @@ var shareGameCmd = &cobra.Command{
 		err = json.NewDecoder(resp.Body).Decode(&res)
 		abortf("Failed to decode server response: %s", err)
 		cli.Success("Success! You can view the game details with the following link:")
-		cli.PrintColor(cli.Cyan, "https://share.code-game.org/%s", res.Id)
+		cli.PrintColor(cli.Cyan, baseURL+"/%s", res.Id)
 	},
 }
 

cmd/share_session.go

@@ -6,13 +6,15 @@ import (
 	"net/http"
 
 	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/go-utils/config"
+	"github.com/code-game-project/go-utils/external"
 	"github.com/spf13/cobra"
 )
 
 // shareSessionCmd represents the share session command
 var shareSessionCmd = &cobra.Command{
 	Use:   "session",
-	Short: "Share a session with share.code-game.org (same as 'codegame session export').",
+	Short: "Share a session with CodeGame Share (same as 'codegame session export').",
 	Args:  cobra.RangeArgs(0, 2),
 	Run: func(cmd *cobra.Command, args []string) {
 		session, err := selectSession(args)
@@ -43,7 +45,11 @@ var shareSessionCmd = &cobra.Command{
 		jsonData, err := json.Marshal(data)
 		abort(err)
 
-		resp, err := http.Post("https://share.code-game.org/session", "application/json", bytes.NewBuffer(jsonData))
+		conf := config.Load()
+		shareURL := external.TrimURL(conf.ShareURL)
+		baseURL := external.BaseURL("http", external.IsTLS(shareURL), shareURL)
+
+		resp, err := http.Post(baseURL+"/session", "application/json", bytes.NewBuffer(jsonData))
 		if err != nil {
 			cli.Error("Failed to upload session: %s", err)
 			return

cmd/share_spectate.go

@@ -6,13 +6,15 @@ import (
 	"net/http"
 
 	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/go-utils/config"
+	"github.com/code-game-project/go-utils/external"
 	"github.com/spf13/cobra"
 )
 
 // shareSpectateCmd represents the share spectate command
 var shareSpectateCmd = &cobra.Command{
 	Use:   "spectate",
-	Short: "Share a spectate link with share.code-game.org.",
+	Short: "Share a spectate link with CodeGame Share.",
 	Args:  cobra.RangeArgs(0, 2),
 	Run: func(cmd *cobra.Command, args []string) {
 		var gameURL string
@@ -63,7 +65,11 @@ var shareSpectateCmd = &cobra.Command{
 		jsonData, err := json.Marshal(data)
 		abort(err)
 
-		resp, err := http.Post("https://share.code-game.org/spectate", "application/json", bytes.NewBuffer(jsonData))
+		conf := config.Load()
+		shareURL := external.TrimURL(conf.ShareURL)
+		baseURL := external.BaseURL("http", external.IsTLS(shareURL), shareURL)
+
+		resp, err := http.Post(baseURL+"/spectate", "application/json", bytes.NewBuffer(jsonData))
 		if err != nil {
 			cli.Error("Failed to upload data: %s", err)
 			return
@@ -85,7 +91,7 @@ var shareSpectateCmd = &cobra.Command{
 		err = json.NewDecoder(resp.Body).Decode(&res)
 		abortf("Failed to decode server response: %s", err)
 		cli.Success("Success! You can spectate the game with the following link:")
-		cli.PrintColor(cli.Cyan, "https://share.code-game.org/%s", res.Id)
+		cli.PrintColor(cli.Cyan, baseURL+"/%s", res.Id)
 	},
 }
 

go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/Bananenpro/cli v0.3.0
 	github.com/adrg/xdg v0.4.0
-	github.com/code-game-project/go-utils v0.3.0
+	github.com/code-game-project/go-utils v0.3.1
 	github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c
 	github.com/google/uuid v1.3.0
 	github.com/mattn/go-colorable v0.1.13

go.sum

@@ -6,8 +6,8 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
-github.com/code-game-project/go-utils v0.3.0 h1:FD09rCsuia6o3Sf/JkQk4j5JGU84loh2d24YS1Tvz4I=
-github.com/code-game-project/go-utils v0.3.0/go.mod h1:/ws9iYkZCnZvS9g2aqdxKwSnU5AEeI7SE1mbB+x4ggg=
+github.com/code-game-project/go-utils v0.3.1 h1:c1qKSPWbVVc4ygU3YBl0wNBu1yjMDoGzGLAWePK9sUo=
+github.com/code-game-project/go-utils v0.3.1/go.mod h1:/ws9iYkZCnZvS9g2aqdxKwSnU5AEeI7SE1mbB+x4ggg=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=