Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9e1702fa4b | ||
|
|
b6f90b61c5 | ||
|
|
764ceb79ec | ||
|
|
e89805bf8e | ||
|
|
cb7c487b42 | ||
|
|
e1ea9cab1f | ||
|
|
a6dc6f5e56 | ||
|
|
203d1bbf69 | ||
|
|
c504f7b165 |
@@ -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
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -12,7 +12,7 @@ type userService struct {
|
||||
|
||||
func (s userService) User(id string) (geeksbot.User, error) {
|
||||
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)
|
||||
err := row.Scan(&user.ID, &user.SteamID, &user.IsActive, &user.IsStaff, &user.IsAdmin)
|
||||
return user, err
|
||||
|
||||
@@ -84,7 +84,7 @@ func requestCommandFunc(ctx disgoman.Context, args []string) {
|
||||
"In: %s",
|
||||
mentionRolesString,
|
||||
request.ID,
|
||||
ctx.Message.Author.Mention,
|
||||
ctx.Message.Author.Mention(),
|
||||
request.Content,
|
||||
request.RequestedAt.UTC().Format(time.UnixDate),
|
||||
ctx.Channel.Mention(),
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user