CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-12-05 08:52:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Permissions] Fix integer commands and empty dict rules (#3987)

Browse Source
This commit is contained in:
Neuro Assassin
2020-06-18 16:44:47 -04:00
committed by GitHub
parent 1cf8308d03
commit dd4095b15b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
redbot/cogs/permissions/permissions.py
View File

@@ -40,12 +40,13 @@ YAML_SCHEMA = Schema(
{ {
UseOptional(COMMAND): Or( UseOptional(COMMAND): Or(
{ {
str: And( Or(str, int): Or(
{ {
Or(int, "default"): And( Or(int, "default"): And(
bool, error=_("Rules must be either `true` or `false`.") bool, error=_("Rules must be either `true` or `false`.")
) )
}, },
{},
error=_("Keys under command names must be IDs (numbers) or `default`."), error=_("Keys under command names must be IDs (numbers) or `default`."),
) )
}, },
@@ -54,7 +55,7 @@ YAML_SCHEMA = Schema(
), ),
UseOptional(COG): Or( UseOptional(COG): Or(
{ {
str: Or( Or(str, int): Or(
{ {
Or(int, "default"): And( Or(int, "default"): And(
bool, error=_("Rules must be either `true` or `false`.") bool, error=_("Rules must be either `true` or `false`.")
@@ -664,7 +665,7 @@ class Permissions(commands.Cog):
for cmd_name, cmd_rules in rules_dict.items(): for cmd_name, cmd_rules in rules_dict.items():
cmd_rules = {str(model_id): rule for model_id, rule in cmd_rules.items()} cmd_rules = {str(model_id): rule for model_id, rule in cmd_rules.items()}
await conf.set_raw(cmd_name, str(guild_id), value=cmd_rules) await conf.set_raw(cmd_name, str(guild_id), value=cmd_rules)
cmd_obj = getter(cmd_name) cmd_obj = getter(str(cmd_name))
if cmd_obj is not None: if cmd_obj is not None:
self._load_rules_for(cmd_obj, {guild_id: cmd_rules}) self._load_rules_for(cmd_obj, {guild_id: cmd_rules})