fix role commands

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/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.CreateRole(r)
+	if err != nil && err.Error() == `pq: duplicate key value violates unique constraint "roles_pkey"` {
+		role, err = s.UpdateRole(r)
+	}
+	return role, err
+}

internal/exts/guild/roles.go

@@ -0,0 +1,103 @@
+package guild
+
+import (
+	"fmt"
+	"strings"
+
+	"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
+	added := make(map[string]bool)
+	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 {
+			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
+				continue
+			}
+			if _, ok := added[id]; ok {
+				continue
+			}
+			_, err := services.GuildService.CreateOrUpdateRole(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
+			}
+			added[id] = true
+			count++
+			_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as a moderator role.", id))
+		}
+		_, _ = ctx.Send(fmt.Sprintf("Added %d moderator roles.", count))
+	} 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
+	added := make(map[string]bool)
+	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 {
+			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
+				continue
+			}
+			if _, ok := added[id]; ok {
+				continue
+			}
+			_, err := services.GuildService.CreateOrUpdateRole(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
+			}
+			added[id] = true
+			count++
+			_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as an admin role.", id))
+		}
+		_, _ = ctx.Send(fmt.Sprintf("Added %d admin roles.", count))
+	} 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)
 }