Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

moderation: clarify permission error #1724

Merged
merged 1 commit into from
Sep 13, 2024
Merged

moderation: clarify permission error #1724

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions moderation/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func MBaseCmd(cmdData *dcmd.Data, targetID int64) (config *Config, targetUser *d

}

func MBaseCmdSecond(cmdData *dcmd.Data, reason string, reasonArgOptional bool, neededPerm int64, additionalPermRoles []int64, enabled bool) (oreason string, err error) {
func MBaseCmdSecond(cmdData *dcmd.Data, reason string, reasonArgOptional bool, neededPerm int64, additionalPermRoles []int64, enabled, additionalPermRolesAvailable bool) (oreason string, err error) {
cmdName := cmdData.Cmd.Trigger.Names[0]
oreason = reason
if !enabled {
Expand Down Expand Up @@ -88,7 +88,11 @@ func MBaseCmdSecond(cmdData *dcmd.Data, reason string, reasonArgOptional bool, n
// Fallback to legacy permissions
hasPerms, err := bot.AdminOrPermMS(cmdData.GuildData.GS.ID, cmdData.ChannelID, member, neededPerm)
if err != nil || !hasPerms {
return oreason, commands.NewUserErrorf("The **%s** command requires the **%s** permission in this channel or additional roles set up by admins, you don't have it. (if you do contact bot support)", cmdName, common.StringPerms[neededPerm])
userError := fmt.Sprintf("The **%s** command requires the **%s** permission in this channel", cmdName, common.StringPerms[neededPerm])
if additionalPermRolesAvailable {
userError += "or additional roles set up by admins"
}
return oreason, commands.NewUserError(userError, ", you don't have it. (if you do contact bot support)")
}

permsMet = true
Expand Down Expand Up @@ -179,7 +183,7 @@ var ModerationCommands = []*commands.YAGCommand{
}

reason := SafeArgString(parsed, 2)
reason, err = MBaseCmdSecond(parsed, reason, config.BanReasonOptional, discordgo.PermissionBanMembers, config.BanCmdRoles, config.BanEnabled)
reason, err = MBaseCmdSecond(parsed, reason, config.BanReasonOptional, discordgo.PermissionBanMembers, config.BanCmdRoles, config.BanEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -234,7 +238,7 @@ var ModerationCommands = []*commands.YAGCommand{
}

reason := SafeArgString(parsed, 1)
reason, err = MBaseCmdSecond(parsed, reason, config.BanReasonOptional, discordgo.PermissionBanMembers, config.BanCmdRoles, config.BanEnabled)
reason, err = MBaseCmdSecond(parsed, reason, config.BanReasonOptional, discordgo.PermissionBanMembers, config.BanCmdRoles, config.BanEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -289,7 +293,7 @@ var ModerationCommands = []*commands.YAGCommand{
}

reason := SafeArgString(parsed, 1)
reason, err = MBaseCmdSecond(parsed, reason, config.KickReasonOptional, discordgo.PermissionKickMembers, config.KickCmdRoles, config.KickEnabled)
reason, err = MBaseCmdSecond(parsed, reason, config.KickReasonOptional, discordgo.PermissionKickMembers, config.KickCmdRoles, config.KickEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -357,7 +361,7 @@ var ModerationCommands = []*commands.YAGCommand{
}

reason := parsed.Args[2].Str()
reason, err = MBaseCmdSecond(parsed, reason, config.MuteReasonOptional, discordgo.PermissionKickMembers, config.MuteCmdRoles, config.MuteEnabled)
reason, err = MBaseCmdSecond(parsed, reason, config.MuteReasonOptional, discordgo.PermissionKickMembers, config.MuteCmdRoles, config.MuteEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -420,7 +424,7 @@ var ModerationCommands = []*commands.YAGCommand{
}

reason := parsed.Args[1].Str()
reason, err = MBaseCmdSecond(parsed, reason, config.UnmuteReasonOptional, discordgo.PermissionKickMembers, config.MuteCmdRoles, config.MuteEnabled)
reason, err = MBaseCmdSecond(parsed, reason, config.UnmuteReasonOptional, discordgo.PermissionKickMembers, config.MuteCmdRoles, config.MuteEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -469,7 +473,7 @@ var ModerationCommands = []*commands.YAGCommand{
}

reason := parsed.Args[2].Str()
reason, err = MBaseCmdSecond(parsed, reason, config.TimeoutReasonOptional, discordgo.PermissionModerateMembers, config.TimeoutCmdRoles, config.TimeoutEnabled)
reason, err = MBaseCmdSecond(parsed, reason, config.TimeoutReasonOptional, discordgo.PermissionModerateMembers, config.TimeoutCmdRoles, config.TimeoutEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -523,7 +527,7 @@ var ModerationCommands = []*commands.YAGCommand{
}

reason := parsed.Args[1].Str()
reason, err = MBaseCmdSecond(parsed, reason, config.TimeoutReasonOptional, discordgo.PermissionModerateMembers, config.TimeoutCmdRoles, config.TimeoutEnabled)
reason, err = MBaseCmdSecond(parsed, reason, config.TimeoutReasonOptional, discordgo.PermissionModerateMembers, config.TimeoutCmdRoles, config.TimeoutEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -566,7 +570,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, 0, nil, config.ReportEnabled)
_, err = MBaseCmdSecond(parsed, "", true, 0, nil, config.ReportEnabled, false)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -659,7 +663,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, nil, config.CleanEnabled)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, nil, config.CleanEnabled, false)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -793,7 +797,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionKickMembers, nil, true)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionKickMembers, nil, true, false)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -848,7 +852,7 @@ var ModerationCommands = []*commands.YAGCommand{
if err != nil {
return nil, err
}
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -894,7 +898,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, true)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, true, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -949,7 +953,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -991,7 +995,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1033,7 +1037,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, config.WarnCommandsEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1077,7 +1081,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, true)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageMessages, config.WarnCmdRoles, true, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1149,7 +1153,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageRoles, config.GiveRoleCmdRoles, config.GiveRoleCmdEnabled)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageRoles, config.GiveRoleCmdRoles, config.GiveRoleCmdEnabled, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1225,7 +1229,7 @@ var ModerationCommands = []*commands.YAGCommand{
return nil, err
}

_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageRoles, config.GiveRoleCmdRoles, config.GiveRoleCmdEnabled)
_, err = MBaseCmdSecond(parsed, "", true, discordgo.PermissionManageRoles, config.GiveRoleCmdRoles, config.GiveRoleCmdEnabled, true)
if err != nil {
return nil, err
}
Expand Down
Loading