summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--golang/cmd/spacetraders/main.go13
-rw-r--r--golang/go.mod4
-rw-r--r--golang/pkg/api/agents.go2
-rw-r--r--golang/pkg/api/register.go2
-rw-r--r--golang/pkg/api/ships.go2
5 files changed, 13 insertions, 10 deletions
diff --git a/golang/cmd/spacetraders/main.go b/golang/cmd/spacetraders/main.go
index e97cc32..574d1b4 100644
--- a/golang/cmd/spacetraders/main.go
+++ b/golang/cmd/spacetraders/main.go
@@ -8,8 +8,9 @@ import (
"os"
"os/signal"
- "git.adyxax.org/adyxax/spacetraders/v2/pkg/api"
- "git.adyxax.org/adyxax/spacetraders/v2/pkg/database"
+ "git.adyxax.org/adyxax/spacetraders/golang/pkg/api"
+ "git.adyxax.org/adyxax/spacetraders/golang/pkg/database"
+ "git.adyxax.org/adyxax/spacetraders/golang/pkg/lib"
)
func main() {
@@ -69,12 +70,12 @@ func run(
if err != nil {
return fmt.Errorf("failed to get agent: %w", err)
}
- slog.Info("agent", "agent", agent)
+ slog.Info("agent", "/my/agent", agent)
default:
- return fmt.Errorf("failed to register: %w\n", err)
+ return fmt.Errorf("failed to register: %w", err)
}
} else {
- return fmt.Errorf("failed to register: %w\n", err)
+ return fmt.Errorf("failed to register with an invalid apiError: %w", err)
}
} else {
token, err := db.GetToken()
@@ -84,6 +85,8 @@ func run(
}
client.SetToken(register.Token)
} else {
+ // We successfully registered but have a tainted database
+ slog.Error("token", "token", register.Token)
return fmt.Errorf("TODO server reset not implemented yet")
}
}
diff --git a/golang/go.mod b/golang/go.mod
index 013778a..b318487 100644
--- a/golang/go.mod
+++ b/golang/go.mod
@@ -1,5 +1,5 @@
-module git.adyxax.org/adyxax/spacetraders/v2
+module git.adyxax.org/adyxax/spacetraders/golang
-go 1.23.4
+go 1.23.6
require github.com/mattn/go-sqlite3 v1.14.24
diff --git a/golang/pkg/api/agents.go b/golang/pkg/api/agents.go
index a2d5b6a..5ac61c4 100644
--- a/golang/pkg/api/agents.go
+++ b/golang/pkg/api/agents.go
@@ -3,7 +3,7 @@ package api
import (
"net/url"
- "git.adyxax.org/adyxax/spacetraders/v2/pkg/model"
+ "git.adyxax.org/adyxax/spacetraders/golang/pkg/model"
)
func (c *Client) MyAgent() (*model.Agent, error) {
diff --git a/golang/pkg/api/register.go b/golang/pkg/api/register.go
index d6c185c..39db790 100644
--- a/golang/pkg/api/register.go
+++ b/golang/pkg/api/register.go
@@ -3,7 +3,7 @@ package api
import (
"net/url"
- "git.adyxax.org/adyxax/spacetraders/v2/pkg/model"
+ "git.adyxax.org/adyxax/spacetraders/golang/pkg/model"
)
func (c *Client) Register(faction, symbol string) (*model.Register, error) {
diff --git a/golang/pkg/api/ships.go b/golang/pkg/api/ships.go
index dc6a27c..9e9797a 100644
--- a/golang/pkg/api/ships.go
+++ b/golang/pkg/api/ships.go
@@ -5,7 +5,7 @@ import (
"net/url"
"path"
- "git.adyxax.org/adyxax/spacetraders/v2/pkg/model"
+ "git.adyxax.org/adyxax/spacetraders/golang/pkg/model"
)
func (c *Client) Dock(s *model.Ship) error {