Merge pull request #10 from Nota30/dev

Database update and handling errors

.env.example

@@ -2,5 +2,4 @@ env="development"
 DISCORD_TOKEN="Bot TOKEN HERE" # Make sure you dont remove the "Bot" at the start. The token should go after it.
 DB_URL="host=localhost user=kiko password=1234 dbname=kiko port=5432"
 LOG_CHANNEL="channel id"
-STATUS_CHANNEL="channel id"
-OpenAIApiKey="api key"
+STATUS_CHANNEL="channel id"

Taskfile.yml

@@ -0,0 +1,9 @@
+# https://taskfile.dev
+
+version: '3'
+
+tasks:
+ run:
+ cmds:
+ - go run cmd/kiko/main.go
+ silent: true

bot/events/components.go

@@ -1,7 +1,7 @@
 package events
 
 import (
- modules "github.com/Nota30/Kiko/modules/Information"
+ information "github.com/Nota30/Kiko/modules/Information"
  "github.com/bwmarrin/discordgo"
 )
 
@@ -18,7 +18,7 @@ func ComponentHandler(s *discordgo.Session, i *discordgo.InteractionCreate) {
  if i.MessageComponentData().ComponentType == 3 {
  switch i.MessageComponentData().CustomID {
  case "select_class":
- modules.RegisterSelector(s, i)
+ information.RegisterSelector(s, i)
  }
  }
 }

bot/events/interaction.go

@@ -1,7 +1,7 @@
 package events
 
 import (
- info "github.com/Nota30/Kiko/modules/Information"
+ information "github.com/Nota30/Kiko/modules/Information"
  tower "github.com/Nota30/Kiko/modules/Tower"
  "github.com/bwmarrin/discordgo"
 )
@@ -17,14 +17,14 @@ func InteractionHandler(s *discordgo.Session, i *discordgo.InteractionCreate) {
 
  switch i.ApplicationCommandData().Name {
  case "ping":
- info.Ping(s, i)
+ information.PingCMD(s, i)
  case "register":
- info.Register(s, i)
+ information.RegisterCMD(s, i)
  case "profile":
- info.Profile(s, i)
+ information.ProfileCMD(s, i)
  case "move":
- tower.Move(s, i)
+ tower.MoveCMD(s, i)
  case "explore":
- tower.Explore(s, i)
+ tower.ExploreCMD(s, i)
  }
 }

bot/events/message.go

@@ -4,6 +4,7 @@ import (
  "strings"
 
  "github.com/bwmarrin/discordgo"
+ "github.com/sirupsen/logrus"
 )
 
 func MSGCreateHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
@@ -36,6 +37,8 @@ func MSGCreateHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
  if !exists {
  return
  }
+
+ logrus.Info(exists)
 }
 
 func getCommand(str string, n int) string {

cache/redis.go

@@ -4,6 +4,7 @@ import (
  "context"
 
  "github.com/redis/go-redis/v9"
+ "github.com/sirupsen/logrus"
 )
 
 var (
@@ -17,4 +18,11 @@ func Connect() {
  Password: "",
  DB: 0,
  })
+
+ pong, err := Client.Ping(Ctx).Result()
+ if err != nil {
+ logrus.Fatal(err)
+ } else {
+ logrus.Info("Connected to Redis ", pong)
+ }
 }

cmd/kiko/main.go

@@ -7,22 +7,27 @@ import (
 
  "github.com/Nota30/Kiko/bot"
  "github.com/Nota30/Kiko/cache"
- database "github.com/Nota30/Kiko/db"
+ "github.com/Nota30/Kiko/database"
  "github.com/joho/godotenv"
  "github.com/sirupsen/logrus"
 )
 
 func main() {
  err := godotenv.Load(".env")
-
  if err != nil {
- logrus.Fatalf("Error loading .env file")
+ logrus.Fatal("Error loading .env file")
  } else {
  logrus.Info("Loaded the environment variables!!")
  }
 
  cache.Connect()
- database.Connect()
+ dbUrl := os.Getenv("DB_URL")
+ if len(dbUrl) == 0 {
+ logrus.Fatal("Database connection string was not found")
+ }
+
+ database.ConnDB(dbUrl)
+
  bot.DiscordConnect()
 
  sc := make(chan os.Signal, 1)

config/commands.go

@@ -28,6 +28,11 @@ var Commands = []*discordgo.ApplicationCommand{
  Description: "Explore the floor you are on",
  DMPermission: &dmPermission,
  },
+ {
+ Name: "inventory",
+ Description: "View the items you have",
+ DMPermission: &dmPermission,
+ },
  {
  Name: "move",
  Description: "Move to a different floor in the tower",
@@ -42,4 +47,18 @@ var Commands = []*discordgo.ApplicationCommand{
  },
  },
  },
+ {
+ Name: "battle",
+ Description: "Start a battle using a battle card",
+ DMPermission: &dmPermission,
+ Options: []*discordgo.ApplicationCommandOption{
+ {
+ Name: "id",
+ Type: discordgo.ApplicationCommandOptionInteger,
+ MinValue: &towerMinFloor,
+ Description: "The id of the battle card (You can find the id using the /inventory command)",
+ Required: true,
+ },
+ },
+ },
 }

config/config.go

@@ -7,12 +7,13 @@ import (
 
 type color struct {
  Default int
+ Blue int
  Error int
 }
 
 var ApplicationCommands []*discordgo.ApplicationCommand
 var RegisterCommand string
-var Color color = color{Default: 0xf62dcd, Error: 0xf32917}
+var Color color = color{Default: 0xf62dcd, Error: 0xf32917, Blue: 0x17caf3}
 var DevGuild = "983931249456455720"
 var Classes = store.Classes
 var Weapons = store.Weapons

database/conn.go

@@ -0,0 +1,39 @@
+package database
+
+import (
+ "github.com/Nota30/Kiko/models"
+ "github.com/sirupsen/logrus"
+ "gorm.io/driver/postgres"
+ "gorm.io/gorm"
+)
+
+var (
+ Db *gorm.DB
+ err error
+)
+
+func ConnDB(dbConURL string) {
+ Db, err = gorm.Open(postgres.Open(dbConURL))
+ if err != nil {
+ logrus.Fatal(err)
+ }
+
+ psql, err := Db.DB()
+ if err != nil {
+ logrus.Fatal(err)
+ }
+ // pong the database
+ err = psql.Ping()
+ if err != nil {
+ logrus.Fatal(err)
+ }
+ // migration
+ err = Db.AutoMigrate(&models.TUser{}, &models.TFloor{}, &models.TInventory{})
+ if err != nil {
+ logrus.Fatal(err)
+ }
+
+ models.User = models.NewUserModel(Db)
+ models.Floor = models.NewFloorModel(Db)
+ models.Inventory = models.NewInventoryModel(Db)
+}

db/tables.sql → database/tables.sql

@@ -1,7 +1,7 @@
 CREATE TABLE IF NOT EXISTS USERS (
  id BIGSERIAL PRIMARY KEY,
  discord_id VARCHAR NOT NULL,
- coins INTEGER NOT NULL DEFAULT 0 CHECK(coins >= 0),
+ coins INTEGER NOT NULL DEFAULT 0,
  level INTEGER NOT NULL DEFAULT 1,
  xp INTEGER NOT NULL DEFAULT 0,
  kills INTEGER NOT NULL DEFAULT 0,

go.mod

@@ -1,6 +1,6 @@
 module github.com/Nota30/Kiko
 
-go 1.19
+go 1.20
 
 require (
  github.com/bwmarrin/discordgo v0.27.1

lib/api/classes.go

@@ -0,0 +1,5 @@
+package api
+
+func FetchAllClasses() {}
+
+func FetchClass() {}