Compare commits

...
7 Commits
Author SHA1 Message Date
Dustin Pianalto 96e8388562 fix bug in user database
CI / build (push) Has been cancelled
2021-01-23 15:10:04 -09:00
Dustin Pianalto 6369f37ce5 fix bug in user service
CI / build (push) Has been cancelled
2021-01-23 15:03:15 -09:00
Dustin Pianalto ab2d51c582 fix bug in user service
CI / build (push) Has been cancelled
2021-01-23 14:59:35 -09:00
Dustin Pianalto 5400d6acd9 fix bug in user service
CI / build (push) Has been cancelled
2021-01-23 14:48:59 -09:00
Dustin Pianalto 74edd574b3 fix bug in user service
CI / build (push) Has been cancelled
2021-01-23 14:46:25 -09:00
Dustin Pianalto 266cde6468 fix bug in running migrations
CI / build (push) Has been cancelled
2021-01-23 04:27:34 -09:00
Dustin Pianalto 8b646731ee change test command name
CI / build (push) Has been cancelled
2021-01-23 04:20:17 -09:00
4 changed files with 12 additions and 7 deletions
+7 -2
View File
@@ -27,7 +27,8 @@ func ConnectDatabase(dbConnString string) {
func(name string) ([]byte, error) {
return migrations.Asset(name)
})
db, err := sql.Open("postgres", dbConnString)
var err error
db, err = sql.Open("postgres", dbConnString)
if err != nil {
log.Fatal(fmt.Errorf("Can't connect to the database: %w", err))
}
@@ -49,7 +50,11 @@ func ConnectDatabase(dbConnString string) {
}
err = m.Up()
if err != nil {
log.Fatal(err)
if err.Error() == "no change" {
log.Println(err)
} else {
log.Fatal(err)
}
}
log.Println("Migrations Run")
initServices()
+2 -1
View File
@@ -20,7 +20,8 @@ func (s userService) User(id string) (geeksbot.User, error) {
func (s userService) CreateUser(u geeksbot.User) (geeksbot.User, error) {
queryString := "INSERT INTO users (id, steam_id, active, staff, admin) VALUES ($1, $2, $3, $4, $5)"
_, err := s.db.Exec(queryString, u.ID, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin)
var err error
_, err = s.db.Exec(queryString, u.ID, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin)
return u, err
}
+2 -1
View File
@@ -250,7 +250,7 @@ func userCommandFunc(ctx disgoman.Context, args []string) {
}
var AddUserCommand = &disgoman.Command{
Name: "user",
Name: "adduser",
Aliases: nil,
Description: "Get user info",
OwnerOnly: false,
@@ -263,6 +263,7 @@ func addUserCommandFunc(ctx disgoman.Context, args []string) {
if ctx.Message.Author.ID == ctx.CommandManager.Owners[0] {
user := geeksbot.User{
ID: ctx.Message.Author.ID,
SteamID: "",
IsActive: true,
IsStaff: true,
IsAdmin: true,
+1 -3
View File
@@ -1,10 +1,8 @@
package geeksbot
import "database/sql"
type User struct {
ID string
SteamID sql.NullString
SteamID string
IsActive bool
IsStaff bool
IsAdmin bool