Fix some exports and paths

leighmacdonald · Mar 23, 2024 · 587933b · 587933b
1 parent 81f90f2
commit 587933b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/cmd/tf2bdd/main.go b/cmd/tf2bdd/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/leighmacdonald/tf2bdd/tf2bdd"
 	"log/slog"
 	"net/http"
 	"os"
@@ -13,6 +12,9 @@ import (
 	"time"
 
 	"github.com/leighmacdonald/steamid/v4/steamid"
+	"github.com/leighmacdonald/tf2bdd/tf2bdd"
+	_ "github.com/ncruces/go-sqlite3/driver"
+	_ "github.com/ncruces/go-sqlite3/embed"
 )
 
 var version = "dev"

diff --git a/tf2bdd/bot.go b/tf2bdd/bot.go
@@ -136,7 +136,7 @@ func addEntry(ctx context.Context, database *sql.DB, sid steamid.SteamID, msg []
 		SteamID: sid,
 	}
 
-	if err := addPlayer(ctx, database, player, author); err != nil {
+	if err := AddPlayer(ctx, database, player, author); err != nil {
 		if err.Error() == "UNIQUE constraint failed: player.steamid" {
 			return "", fmt.Errorf("duplicate steam id: %s", sid.String())
 		}
@@ -247,7 +247,7 @@ func loadAttachment(ctx context.Context, client *http.Client, database *sql.DB,
 
 	added := 0
 	for _, p := range toAdd {
-		if errAdd := addPlayer(ctx, database, p, author); errAdd != nil {
+		if errAdd := AddPlayer(ctx, database, p, author); errAdd != nil {
 			slog.Error("failed to add new entry", slog.String("error", errAdd.Error()))
 
 			continue

diff --git a/tf2bdd/db.go b/tf2bdd/db.go
@@ -9,8 +9,6 @@ import (
 	"time"
 
 	"github.com/leighmacdonald/steamid/v4/steamid"
-	_ "github.com/ncruces/go-sqlite3/driver"
-	_ "github.com/ncruces/go-sqlite3/embed"
 )
 
 func OpenDB(dbPath string) (*sql.DB, error) {
@@ -129,7 +127,7 @@ func getPlayers(ctx context.Context, db *sql.DB) ([]Player, error) {
 	return players, nil
 }
 
-func addPlayer(ctx context.Context, db *sql.DB, player Player, author int64) error {
+func AddPlayer(ctx context.Context, db *sql.DB, player Player, author int64) error {
 	const query = `
 		INSERT INTO player (steamid, attributes, last_seen, last_name, author, created_on)
 		VALUES(?, ?, ?, ?, ?, ?)`

diff --git a/tf2bdd/server_test.go b/tf2bdd/server_test.go
@@ -1,4 +1,4 @@
-package tf2bdd
+package tf2bdd_test
 
 import (
 	"context"
@@ -10,20 +10,23 @@ import (
 	"testing"
 
 	"github.com/leighmacdonald/steamid/v4/steamid"
+	"github.com/leighmacdonald/tf2bdd/tf2bdd"
+	_ "github.com/ncruces/go-sqlite3/driver"
+	_ "github.com/ncruces/go-sqlite3/embed"
 	"github.com/stretchr/testify/require"
 )
 
 func newTestDB(ctx context.Context) (*sql.DB, error) {
-	db, errDB := OpenDB(":memory:")
+	db, errDB := tf2bdd.OpenDB(":memory:")
 	if errDB != nil {
 		return nil, errDB
 	}
 
-	return db, SetupDB(ctx, db)
+	return db, tf2bdd.SetupDB(ctx, db)
 }
 
 func TestHandleGetSteamIDS(t *testing.T) {
-	testConfig := Config{
+	testConfig := tf2bdd.Config{
 		SteamKey:        "",
 		DiscordClientID: "",
 		DiscordBotToken: "",
@@ -48,27 +51,27 @@ func TestHandleGetSteamIDS(t *testing.T) {
 	database, errApp := newTestDB(ctx)
 	require.NoError(t, errApp)
 
-	localPlayers := []Player{
+	localPlayers := []tf2bdd.Player{
 		{
 			SteamID:    steamid.New(76561198237337976),
 			Attributes: []string{"cheater"},
-			LastSeen:   LastSeen{},
+			LastSeen:   tf2bdd.LastSeen{},
 		},
 		{
 			SteamID:    steamid.New(76561198834913692),
 			Attributes: []string{"cheater"},
-			LastSeen:   LastSeen{},
+			LastSeen:   tf2bdd.LastSeen{},
 		},
 	}
 
 	for _, p := range localPlayers {
-		require.NoError(t, addPlayer(ctx, database, p, 0))
+		require.NoError(t, tf2bdd.AddPlayer(ctx, database, p, 0))
 	}
 
-	CreateRouter(database, testConfig).ServeHTTP(recorder, req)
+	tf2bdd.CreateRouter(database, testConfig).ServeHTTP(recorder, req)
 	require.Equal(t, http.StatusOK, recorder.Code)
 
-	var players PlayerListRoot
+	var players tf2bdd.PlayerListRoot
 	require.NoError(t, json.NewDecoder(recorder.Body).Decode(&players))
 	require.Equal(t, len(localPlayers), len(players.Players))
 }