Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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) {
|
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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user