Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
764ceb79ec | ||
|
|
e89805bf8e | ||
|
|
cb7c487b42 | ||
|
|
e1ea9cab1f | ||
|
|
a6dc6f5e56 | ||
|
|
203d1bbf69 |
@@ -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
|
||||||
}
|
}
|
||||||
@@ -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) {
|
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 {
|
if err == sql.ErrNoRows {
|
||||||
guild, err := GuildService.GetOrCreateGuild(guild_id)
|
var guild geeksbot.Guild
|
||||||
|
guild, err = GuildService.GetOrCreateGuild(guild_id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return geeksbot.Channel{}, err
|
return geeksbot.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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user