Compare commits

...
5 Commits
Author SHA1 Message Date
Dustin Pianalto e1ea9cab1f fix create channel sql query
CI / build (push) Has been cancelled
2021-01-25 01:59:57 -09:00
Dustin Pianalto a6dc6f5e56 fix get user sql query
CI / build (push) Has been cancelled
2021-01-25 01:52:14 -09:00
Dustin Pianalto 203d1bbf69 fix get user sql query
CI / build (push) Has been cancelled
2021-01-25 01:43:31 -09:00
Dustin Pianalto c504f7b165 fix get user sql query
CI / build (push) Has been cancelled
2021-01-25 01:38:22 -09:00
Dustin Pianalto 34564140f5 add request command
CI / build (push) Has been cancelled
2021-01-25 01:33:46 -09:00
3 changed files with 11 additions and 5 deletions
+8 -2
View File
@@ -29,7 +29,7 @@ func (s channelService) Channel(id string) (geeksbot.Channel, error) {
} }
func (s channelService) CreateChannel(c geeksbot.Channel) (geeksbot.Channel, error) { func (s channelService) CreateChannel(c geeksbot.Channel) (geeksbot.Channel, error) {
queryString := "INSERT INTO channels (id, guild_id, admin, default_channel, new_patron VALUES ($1, $2, $3, $4, $5))" queryString := "INSERT INTO channels (id, guild_id, admin, default_channel, new_patron) VALUES ($1, $2, $3, $4, $5)"
_, err := s.db.Exec(queryString, c.ID, c.Guild.ID, c.Admin, c.Default, c.NewPatron) _, err := s.db.Exec(queryString, c.ID, c.Guild.ID, c.Admin, c.Default, c.NewPatron)
return c, err return c, err
} }
@@ -69,8 +69,12 @@ func (s channelService) GuildChannels(g geeksbot.Guild) ([]geeksbot.Channel, err
func (s channelService) GetOrCreateChannel(id string, guild_id string) (geeksbot.Channel, error) { func (s channelService) GetOrCreateChannel(id string, guild_id string) (geeksbot.Channel, error) {
channel, err := s.Channel(id) channel, err := s.Channel(id)
if err == sql.ErrNoRows { log.Println(err)
log.Println(1)
if err.Error() == sql.ErrNoRows.Error() {
guild, err := GuildService.GetOrCreateGuild(guild_id) guild, err := GuildService.GetOrCreateGuild(guild_id)
log.Println(err)
log.Println(2)
if err != nil { if err != nil {
return geeksbot.Channel{}, err return geeksbot.Channel{}, err
} }
@@ -82,5 +86,7 @@ func (s channelService) GetOrCreateChannel(id string, guild_id string) (geeksbot
NewPatron: false, NewPatron: false,
}) })
} }
log.Println(err)
log.Println(3)
return channel, err return channel, err
} }
+1 -1
View File
@@ -12,7 +12,7 @@ type userService struct {
func (s userService) User(id string) (geeksbot.User, error) { func (s userService) User(id string) (geeksbot.User, error) {
var user geeksbot.User var user geeksbot.User
queryString := "SELECT id, steam_id, active, staff, admin WHERE id = $1" queryString := "SELECT id, steam_id, active, staff, admin FROM users WHERE id = $1"
row := s.db.QueryRow(queryString, id) row := s.db.QueryRow(queryString, id)
err := row.Scan(&user.ID, &user.SteamID, &user.IsActive, &user.IsStaff, &user.IsAdmin) err := row.Scan(&user.ID, &user.SteamID, &user.IsActive, &user.IsStaff, &user.IsAdmin)
return user, err return user, err
+2 -2
View File
@@ -31,12 +31,12 @@ func requestCommandFunc(ctx disgoman.Context, args []string) {
requestMsg := strings.Join(args, " ") requestMsg := strings.Join(args, " ")
author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID) author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
if err != nil { if err != nil {
discord_utils.SendErrorMessage(ctx, "Error creating the request", err) discord_utils.SendErrorMessage(ctx, "Error creating the request. Could not get user.", err)
return return
} }
channel, err := services.ChannelService.GetOrCreateChannel(ctx.Message.ChannelID, ctx.Guild.ID) channel, err := services.ChannelService.GetOrCreateChannel(ctx.Message.ChannelID, ctx.Guild.ID)
if err != nil { if err != nil {
discord_utils.SendErrorMessage(ctx, "Error creating the request", err) discord_utils.SendErrorMessage(ctx, "Error creating the request. Could not get channel.", err)
return return
} }
int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64) int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64)