Compare commits

...
7 Commits
Author SHA1 Message Date
Dustin Pianalto b6f90b61c5 fix create request command
CI / build (push) Has been cancelled
2021-01-25 02:27:56 -09:00
Dustin Pianalto 764ceb79ec fix create request sql query
CI / build (push) Has been cancelled
2021-01-25 02:20:11 -09:00
Dustin Pianalto e89805bf8e fix create channel sql query
CI / build (push) Has been cancelled
2021-01-25 02:11:28 -09:00
Dustin Pianalto cb7c487b42 fix create channel sql query
CI / build (push) Has been cancelled
2021-01-25 02:05:13 -09:00
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
3 changed files with 13 additions and 4 deletions
+3 -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) {
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)
return c, err
}
@@ -70,7 +70,8 @@ func (s channelService) GuildChannels(g geeksbot.Guild) ([]geeksbot.Channel, err
func (s channelService) GetOrCreateChannel(id string, guild_id string) (geeksbot.Channel, error) {
channel, err := s.Channel(id)
if err == sql.ErrNoRows {
guild, err := GuildService.GetOrCreateGuild(guild_id)
var guild geeksbot.Guild
guild, err = GuildService.GetOrCreateGuild(guild_id)
if err != nil {
return geeksbot.Channel{}, err
}
+9 -1
View File
@@ -124,6 +124,14 @@ func (s requestService) CreateRequest(r geeksbot.Request) (geeksbot.Request, err
completed, completed_at, completed_by, message_id, completed_message)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id`
var id int64
var completedByID sql.NullString
if r.CompletedBy == nil {
completedByID.String = ""
completedByID.Valid = false
} else {
completedByID.String = r.CompletedBy.ID
completedByID.Valid = true
}
err := s.db.QueryRow(queryString,
r.Author.ID,
r.Channel.ID,
@@ -132,7 +140,7 @@ func (s requestService) CreateRequest(r geeksbot.Request) (geeksbot.Request, err
r.RequestedAt,
r.Completed,
r.CompletedAt,
r.CompletedBy.ID,
completedByID,
r.Message.ID,
r.CompletedMessage).Scan(&id)
if err != nil {
+1 -1
View File
@@ -95,7 +95,7 @@ func requestCommandFunc(ctx disgoman.Context, args []string) {
}
_, err = ctx.Send(fmt.Sprintf("%s The admin have recieved your request.\n "+
"If you would like to close or add a comment to this request please reference ID `%v`",
ctx.Message.Author.Mention, request.ID,
ctx.Message.Author.Mention(), request.ID,
))
if err != nil {
discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was created.", err)