wayfinderak/Geeksbot
1
0
Fork 0
Code Issues Pull Requests Actions 118 Packages Projects Releases Wiki Activity

remove mod/admin role command
Some checks are pending
CI / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Dustin Pianalto 2021-01-26 00:08:20 -09:00
parent 132bf94332
commit 71aac148e0
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/exts/guild/roles.go
View File

@ -8,6 +8,7 @@ import (
"github.com/dustinpianalto/geeksbot" "github.com/dustinpianalto/geeksbot"
"github.com/dustinpianalto/geeksbot/internal/discord_utils" "github.com/dustinpianalto/geeksbot/internal/discord_utils"
"github.com/dustinpianalto/geeksbot/internal/services" "github.com/dustinpianalto/geeksbot/internal/services"
"github.com/dustinpianalto/geeksbot/internal/utils"
) )
var AddModeratorRoleCommand = &disgoman.Command{ var AddModeratorRoleCommand = &disgoman.Command{
@ -54,7 +55,7 @@ func addModeratorRoleCommandFunc(ctx disgoman.Context, args []string) {
count++ count++
_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as a moderator role.", id)) _, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as a moderator role.", id))
} }
_, _ = ctx.Send(fmt.Sprintf("Added %d moderator roles.", count)) _, _ = ctx.Send(fmt.Sprintf("Added %d moderator %s.", count, utils.PluralizeString("role", count)))
} else { } else {
_, _ = ctx.Send("Please include at least one role to make a moderator role.") _, _ = ctx.Send("Please include at least one role to make a moderator role.")
} }
@ -104,7 +105,7 @@ func addAdminRoleCommandFunc(ctx disgoman.Context, args []string) {
count++ count++
_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as an admin role.", id)) _, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as an admin role.", id))
} }
_, _ = ctx.Send(fmt.Sprintf("Added %d admin roles.", count)) _, _ = ctx.Send(fmt.Sprintf("Added %d admin %s.", count, utils.PluralizeString("role", count)))
} else { } else {
_, _ = ctx.Send("Please include at least one role to make an admin role.") _, _ = ctx.Send("Please include at least one role to make an admin role.")
} }
@ -138,9 +139,16 @@ func removeModRoleCommandFunc(ctx disgoman.Context, args []string) {
continue continue
} }
if _, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil { if _, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
if _, err := services.GuildService.Role(id); err != nil { if r, err := services.GuildService.Role(id); err != nil {
_, _ = ctx.Send(fmt.Sprintf("%s does not reference a valid role for this guild.", id)) _, _ = ctx.Send(fmt.Sprintf("%s does not reference a valid role for this guild.", id))
continue continue
} else {
err = services.GuildService.DeleteRole(r)
if err != nil {
discord_utils.SendErrorMessage(ctx, "Something went wrong deleting the role", err)
}
_, _ = ctx.Send(fmt.Sprintf("Deleted <@&%s> as a no longer a valid role.", id))
continue
} }
} }
_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{ _, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
@ -149,14 +157,14 @@ func removeModRoleCommandFunc(ctx disgoman.Context, args []string) {
Guild: guild, Guild: guild,
}) })
if err != nil { if err != nil {
discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem adding <@&%s>", id), err) discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem updating <@&%s>", id), err)
continue continue
} }
added[id] = true added[id] = true
count++ count++
_, _ = ctx.Send(fmt.Sprintf("Set <@&%s> as a normal role.", id)) _, _ = ctx.Send(fmt.Sprintf("Set <@&%s> as a normal role.", id))
} }
_, _ = ctx.Send(fmt.Sprintf("Set %d roles to normal.", count)) _, _ = ctx.Send(fmt.Sprintf("Set %d %s to normal.", count, utils.PluralizeString("role", count)))
} else { } else {
_, _ = ctx.Send("Please include at least one role to remove from the moderator or admin lists.") _, _ = ctx.Send("Please include at least one role to remove from the moderator or admin lists.")
} }

7
internal/utils/utils.go
View File

@ -12,3 +12,10 @@ func RemoveDuplicateStrings(s []string) []string {
} }
return o return o
} }
func PluralizeString(s string, i int) string {
if i == 1 {
return s
}
return s + "s"
}