Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96e8388562 | ||
|
|
6369f37ce5 | ||
|
|
ab2d51c582 | ||
|
|
5400d6acd9 | ||
|
|
74edd574b3 | ||
|
|
266cde6468 | ||
|
|
8b646731ee | ||
|
|
c54f8450b1 |
@@ -27,7 +27,8 @@ func ConnectDatabase(dbConnString string) {
|
|||||||
func(name string) ([]byte, error) {
|
func(name string) ([]byte, error) {
|
||||||
return migrations.Asset(name)
|
return migrations.Asset(name)
|
||||||
})
|
})
|
||||||
db, err := sql.Open("postgres", dbConnString)
|
var err error
|
||||||
|
db, err = sql.Open("postgres", dbConnString)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(fmt.Errorf("Can't connect to the database: %w", err))
|
log.Fatal(fmt.Errorf("Can't connect to the database: %w", err))
|
||||||
}
|
}
|
||||||
@@ -49,8 +50,12 @@ func ConnectDatabase(dbConnString string) {
|
|||||||
}
|
}
|
||||||
err = m.Up()
|
err = m.Up()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if err.Error() == "no change" {
|
||||||
|
log.Println(err)
|
||||||
|
} else {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
log.Println("Migrations Run")
|
log.Println("Migrations Run")
|
||||||
initServices()
|
initServices()
|
||||||
log.Println("Services Initialized")
|
log.Println("Services Initialized")
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
ALTER TABLE requests
|
ALTER TABLE requests
|
||||||
ADD COLUMN guild_id varchar(30) REFERENCES guilds(id) ON DELETE CASCADSE;
|
ADD COLUMN guild_id varchar(30) CONSTRAINT fk_guild REFERENCES guilds(id) ON DELETE CASCADE;
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ func (s userService) User(id string) (geeksbot.User, error) {
|
|||||||
|
|
||||||
func (s userService) CreateUser(u geeksbot.User) (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)"
|
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
|
return u, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -250,7 +250,7 @@ func userCommandFunc(ctx disgoman.Context, args []string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var AddUserCommand = &disgoman.Command{
|
var AddUserCommand = &disgoman.Command{
|
||||||
Name: "user",
|
Name: "adduser",
|
||||||
Aliases: nil,
|
Aliases: nil,
|
||||||
Description: "Get user info",
|
Description: "Get user info",
|
||||||
OwnerOnly: false,
|
OwnerOnly: false,
|
||||||
@@ -263,6 +263,7 @@ func addUserCommandFunc(ctx disgoman.Context, args []string) {
|
|||||||
if ctx.Message.Author.ID == ctx.CommandManager.Owners[0] {
|
if ctx.Message.Author.ID == ctx.CommandManager.Owners[0] {
|
||||||
user := geeksbot.User{
|
user := geeksbot.User{
|
||||||
ID: ctx.Message.Author.ID,
|
ID: ctx.Message.Author.ID,
|
||||||
|
SteamID: "",
|
||||||
IsActive: true,
|
IsActive: true,
|
||||||
IsStaff: true,
|
IsStaff: true,
|
||||||
IsAdmin: true,
|
IsAdmin: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user