Add sar commands

internal/exts/guild/roles.go

@@ -2,6 +2,7 @@ package guild
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/bwmarrin/discordgo"
@@ -277,7 +278,7 @@ func removeSelfAssignableRoleCommandFunc(ctx disgoman.Context, args []string) {
 
 var SelfAssignRoleCommand = &disgoman.Command{
 	Name:                "giverole",
-	Aliases:             []string{"iwant", "givetome"},
+	Aliases:             []string{"iwant", "givetome", "addrole"},
 	Description:         "Assigns a person the passed in role if it is self assignable",
 	OwnerOnly:           false,
 	Hidden:              false,
@@ -290,16 +291,26 @@ func selfAssignRoleCommandFunc(ctx disgoman.Context, args []string) {
 	roles := append(args, ctx.Message.MentionRoles...)
 	if len(roles) > 0 {
 		for _, id := range roles {
+			var roleID string
 			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
 				continue
+			} else if _, err := strconv.Atoi(id); err == nil {
+				roleID = id
+			} else {
+				for _, role := range ctx.Guild.Roles {
+					if strings.ToLower(id) == strings.ToLower(role.Name) {
+						roleID = role.ID
+					}
+				}
 			}
+
 			if _, ok := added[id]; ok {
 				continue
 			}
 			var role *discordgo.Role
 			var err error
-			if role, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", id), err)
+			if role, err = ctx.Session.State.Role(ctx.Guild.ID, roleID); err != nil {
+				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", roleID), err)
 				return
 			}
 			if memberHasRole(ctx.Member, role.ID) {
@@ -339,8 +350,17 @@ func unAssignRoleCommandFunc(ctx disgoman.Context, args []string) {
 	roles := append(args, ctx.Message.MentionRoles...)
 	if len(roles) > 0 {
 		for _, id := range roles {
+			var roleID string
 			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
 				continue
+			} else if _, err := strconv.Atoi(id); err == nil {
+				roleID = id
+			} else {
+				for _, role := range ctx.Guild.Roles {
+					if strings.ToLower(id) == strings.ToLower(role.Name) {
+						roleID = role.ID
+					}
+				}
 			}
 			if _, ok := removed[id]; ok {
 				continue
@@ -348,8 +368,8 @@ func unAssignRoleCommandFunc(ctx disgoman.Context, args []string) {
 
 			var role *discordgo.Role
 			var err error
-			if role, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", id), err)
+			if role, err = ctx.Session.State.Role(ctx.Guild.ID, roleID); err != nil {
+				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", roleID), err)
 				return
 			}
 			if !memberHasRole(ctx.Member, role.ID) {

internal/exts/init.go

@@ -27,5 +27,9 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
 	_ = g.AddCommand(guild.AddModeratorRoleCommand)
 	_ = g.AddCommand(guild.AddAdminRoleCommand)
 	_ = g.AddCommand(guild.RemoveModRoleCommand)
+	_ = g.AddCommand(guild.MakeRoleSelfAssignableCommand)
+	_ = g.AddCommand(guild.RemoveSelfAssignableCommand)
+	_ = g.AddCommand(guild.SelfAssignRoleCommand)
+	_ = g.AddCommand(guild.UnAssignRoleCommand)
 	_ = g.AddCommand(requests.RequestCommand)
 }