Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dhawton committed Sep 6, 2023
1 parent 73df38c commit 299b030
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 202 deletions.
25 changes: 0 additions & 25 deletions cmd/bot/app/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"strings"
"syscall"

"github.com/adh-partnership/api/pkg/database"
"github.com/adh-partnership/api/pkg/logger"
"github.com/urfave/cli/v2"

Expand All @@ -33,7 +32,6 @@ import (
"github.com/vpaza/bot/internal/facility"
"github.com/vpaza/bot/pkg/cache"
"github.com/vpaza/bot/pkg/config"
botdatabase "github.com/vpaza/bot/pkg/database"
"github.com/vpaza/bot/pkg/jobs"
)

Expand Down Expand Up @@ -92,29 +90,6 @@ func newStartCommand() *cli.Command {

log.Debugf("FacCfg=%+v", facility.FacCfg)

log.Infof("Building database connection...")
err = database.Connect(database.DBOptions{
Host: config.Cfg.Database.Host,
Port: config.Cfg.Database.Port,
User: config.Cfg.Database.Username,
Password: config.Cfg.Database.Password,
Database: config.Cfg.Database.Database,
CACert: config.Cfg.Database.CACert,
Driver: "mysql",
Logger: logger.Logger,
})
if err != nil {
return err
}

log.Infof("Running migrations...")
err = database.DB.AutoMigrate(
&botdatabase.Bot{},
)
if err != nil {
return err
}

log.Infof("Configuring cache")
err = cache.Setup()
if err != nil {
Expand Down
99 changes: 0 additions & 99 deletions commands.go

This file was deleted.

30 changes: 1 addition & 29 deletions pkg/config/configtypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,10 @@
package config

type Config struct {
Database ConfigDatabase `json:"database"`
Discord ConfigDiscord `json:"discord"`
}

type ConfigDatabase struct {
Host string `json:"host"`
Port string `json:"port"`
Username string `json:"user"`
Password string `json:"password"`
Database string `json:"database"`
AutoMigrate bool `json:"auto_migrate"`
CACert string `json:"ca_cert"`
Discord ConfigDiscord `json:"discord"`
}

type ConfigDiscord struct {
AppID string `json:"app_id"`
Token string `json:"token"`
}

type FacilityConfig struct {
Facility string `json:"facility"`
DiscordID string `json:"discord_id"`
Description string `json:"description"`
NameFormat string `json:"name_format"`
RosterAPI string `json:"roster_api"`
API string `json:"api"`
Roles []struct {
ID string `json:"id"`
Name string `json:"name"`
If []struct {
Condition string `json:"condition"`
Value string `json:"value"`
} `json:"if"`
} `json:"roles"`
}
49 changes: 0 additions & 49 deletions pkg/database/bot.go

This file was deleted.

0 comments on commit 299b030

Please sign in to comment.