Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6f90b61c5 | ||
|
|
764ceb79ec | ||
|
|
e89805bf8e | ||
|
|
cb7c487b42 |
@@ -69,12 +69,9 @@ 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)
|
||||||
log.Println(err)
|
if err == sql.ErrNoRows {
|
||||||
log.Println(1)
|
var guild geeksbot.Guild
|
||||||
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
|
||||||
}
|
}
|
||||||
@@ -86,7 +83,5 @@ 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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -124,6 +124,14 @@ func (s requestService) CreateRequest(r geeksbot.Request) (geeksbot.Request, err
|
|||||||
completed, completed_at, completed_by, message_id, completed_message)
|
completed, completed_at, completed_by, message_id, completed_message)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id`
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id`
|
||||||
var id int64
|
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,
|
err := s.db.QueryRow(queryString,
|
||||||
r.Author.ID,
|
r.Author.ID,
|
||||||
r.Channel.ID,
|
r.Channel.ID,
|
||||||
@@ -132,7 +140,7 @@ func (s requestService) CreateRequest(r geeksbot.Request) (geeksbot.Request, err
|
|||||||
r.RequestedAt,
|
r.RequestedAt,
|
||||||
r.Completed,
|
r.Completed,
|
||||||
r.CompletedAt,
|
r.CompletedAt,
|
||||||
r.CompletedBy.ID,
|
completedByID,
|
||||||
r.Message.ID,
|
r.Message.ID,
|
||||||
r.CompletedMessage).Scan(&id)
|
r.CompletedMessage).Scan(&id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ func requestCommandFunc(ctx disgoman.Context, args []string) {
|
|||||||
}
|
}
|
||||||
_, err = ctx.Send(fmt.Sprintf("%s The admin have recieved your request.\n "+
|
_, 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`",
|
"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 {
|
if err != nil {
|
||||||
discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was created.", err)
|
discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was created.", err)
|
||||||
|
|||||||
Reference in New Issue
Block a user