diff --git a/djpianalto.com/goff/goff.go b/djpianalto.com/goff/goff.go index 7ff4bfc..b2c1afe 100644 --- a/djpianalto.com/goff/goff.go +++ b/djpianalto.com/goff/goff.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "log" "djpianalto.com/goff/djpianalto.com/goff/events" "djpianalto.com/goff/djpianalto.com/goff/exts" @@ -101,8 +102,24 @@ func main() { } } -func getPrefixes(guild_id string) []string { - return []string{"Go.", "go."} +func getPrefixes(guildID string) []string { + queryString := "Select prefix from prefixes p, x_guilds_prefixes xgp where xgp.guild_id = $1 and xgp.prefix_id = p.id" + rows, err := utils.Database.Query(queryString, guildID) + if err != nil { + log.Println(err) + return []string{"Go.", "go."} + } + var prefixes []string + for rows.Next() { + var prefix string + err = rows.Scan(&prefix) + if err != nil { + log.Println(err) + return []string{"Go.", "go."} + } + prefixes = append(prefixes, prefix) + } + return prefixes } func ErrorHandler(ErrorChan chan disgoman.CommandError) { diff --git a/djpianalto.com/goff/utils/database.go b/djpianalto.com/goff/utils/database.go index 7048418..6ca6296 100644 --- a/djpianalto.com/goff/utils/database.go +++ b/djpianalto.com/goff/utils/database.go @@ -3,6 +3,7 @@ package utils import ( "database/sql" "fmt" + _ "github.com/lib/pq" ) @@ -84,7 +85,8 @@ func InitializeDatabase() { "user_id varchar(30) not null," + "creation_time timestamp not null default NOW()," + "trigger_time timestamp not null," + - "completed bool not null default false)") + "completed bool not null default false," + + "processing bool default false)") if err != nil { fmt.Println(err) } @@ -103,7 +105,7 @@ func LoadTestData() { if err != nil { fmt.Println(err) } - _, err = Database.Query("INSERT INTO prefixes (prefix) VALUES ('Go.'), ('go.'), ('go,')") + _, err = Database.Query("INSERT INTO prefixes (prefix) VALUES ('Godev.'), ('godev.'), ('godev,')") if err != nil { fmt.Println(err) } diff --git a/docker-dev.yml b/docker-dev.yml new file mode 100644 index 0000000..15da14d --- /dev/null +++ b/docker-dev.yml @@ -0,0 +1,32 @@ +version: "3" + +services: +# goff-db: +# image: postgres +# ports: +# - "5432:5432" +# volumes: +# - "${PWD}/postgres.conf:/etc/postgresql/postgresql.conf" +# - "goff-db:/var/lib/postgresql/data:rw" +# env_file: ${PWD}/.env + + goff: + build: + context: . + dockerfile: "${PWD}/Dockerfile" + env_file: ${PWD}/.env +# logging: +# driver: awslogs +# options: +# awslogs-region: us-east-1 +# awslogs-group: "/docker/goff/production" +# depends_on: +# - goff-db + environment: + - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?sslmode=disable +# links: +# - goff-db:goff.db + +#volumes: +# goff-db: +# external: true