add admin role command

guild.go

@@ -25,4 +25,5 @@ type GuildService interface {
 	UpdateRole(r Role) (Role, error)
 	DeleteRole(r Role) error
 	GetOrCreateGuild(id string) (Guild, error)
+	CreateOrUpdateRole(r Role) (Role, error)
 }

internal/database/channel.go

@@ -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
 }
@@ -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) {
 	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 {
 			return geeksbot.Channel{}, err
 		}
@@ -86,7 +83,5 @@ func (s channelService) GetOrCreateChannel(id string, guild_id string) (geeksbot
 			NewPatron: false,
 		})
 	}
-	log.Println(err)
-	log.Println(3)
 	return channel, err
 }

internal/database/guild.go

@@ -111,3 +111,11 @@ func (s guildService) GetOrCreateGuild(id string) (geeksbot.Guild, error) {
 	}
 	return guild, err
 }
+
+func (s guildService) CreateOrUpdateRole(r geeksbot.Role) (geeksbot.Role, error) {
+	role, err := s.Role(r.ID)
+	if err.Error() == `pq: duplicate key value violates unique constraint "roles_pkey"` {
+		role, err = s.UpdateRole(r)
+	}
+	return role, err
+}

internal/database/request.go

@@ -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 {

internal/exts/guild/roles.go

@@ -0,0 +1,84 @@
+package guild
+
+import (
+	"fmt"
+
+	"github.com/dustinpianalto/disgoman"
+	"github.com/dustinpianalto/geeksbot"
+	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
+	"github.com/dustinpianalto/geeksbot/internal/services"
+)
+
+var AddModeratorRoleCommand = &disgoman.Command{
+	Name:                "addMod",
+	Aliases:             []string{"addModerator", "addModRole"},
+	Description:         "Add a role which is allowed to run moderator commands",
+	OwnerOnly:           false,
+	Hidden:              false,
+	RequiredPermissions: disgoman.PermissionManageServer,
+	Invoke:              addModeratorRoleCommandFunc,
+}
+
+func addModeratorRoleCommandFunc(ctx disgoman.Context, args []string) {
+	var count int
+	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
+	if err != nil {
+		discord_utils.SendErrorMessage(ctx, "Something went wrong getting the guild", err)
+		return
+	}
+	roles := append(args, ctx.Message.MentionRoles...)
+	if len(roles) > 0 {
+		for _, id := range roles {
+			_, err := services.GuildService.CreateRole(geeksbot.Role{
+				ID:       id,
+				RoleType: "moderator",
+				Guild:    guild,
+			})
+			if err != nil {
+				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem adding <@&%s>", id), err)
+				continue
+			}
+			count++
+			_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as a moderator role.", id))
+		}
+	} else {
+		_, _ = ctx.Send("Please include at least one role to make a moderator role.")
+	}
+}
+
+var AddAdminRoleCommand = &disgoman.Command{
+	Name:                "addAdmin",
+	Aliases:             []string{"addAdminRole"},
+	Description:         "Add a role which is allowed to run admin commands",
+	OwnerOnly:           false,
+	Hidden:              false,
+	RequiredPermissions: disgoman.PermissionManageServer,
+	Invoke:              addAdminRoleCommandFunc,
+}
+
+func addAdminRoleCommandFunc(ctx disgoman.Context, args []string) {
+	var count int
+	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
+	if err != nil {
+		discord_utils.SendErrorMessage(ctx, "Something went wrong getting the guild", err)
+		return
+	}
+	roles := append(args, ctx.Message.MentionRoles...)
+	if len(roles) > 0 {
+		for _, id := range roles {
+			_, err := services.GuildService.CreateRole(geeksbot.Role{
+				ID:       id,
+				RoleType: "admin",
+				Guild:    guild,
+			})
+			if err != nil {
+				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem adding <@&%s>", id), err)
+				continue
+			}
+			count++
+			_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as an admin role.", id))
+		}
+	} else {
+		_, _ = ctx.Send("Please include at least one role to make an admin role.")
+	}
+}

internal/exts/init.go

@@ -24,5 +24,7 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
 	_ = g.AddCommand(utils.PingCommand)
 	_ = g.AddCommand(guild.AddPrefixCommand)
 	_ = g.AddCommand(guild.RemovePrefixCommand)
+	_ = g.AddCommand(guild.AddModeratorRoleCommand)
+	_ = g.AddCommand(guild.AddAdminRoleCommand)
 	_ = g.AddCommand(requests.RequestCommand)
 }

internal/exts/requests/requests.go

@@ -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)