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

[Core V3] Fix checks (#924)

Browse Source 
* Fix global checks

* Fix bank's checks

Predicates for decorators return true or false, they don't return other decorators

* Async getters in core checks
This commit is contained in:
Tobotimus
2017-08-16 08:09:57 +10:00
committed by palmtree5
parent 2a19f151fc
commit 115418d323
3 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/checks.py
View File

@@ -24,8 +24,9 @@ def mod_or_permissions(**perms):
if ctx.guild is None:
return has_perms_or_is_owner
author = ctx.author
mod_role_id = ctx.bot.db.guild(ctx.guild).mod_role()
admin_role_id = ctx.bot.db.guild(ctx.guild).admin_role()
settings = ctx.bot.db.guild(ctx.guild)
mod_role_id = await settings.mod_role()
admin_role_id = await settings.admin_role()
mod_role = discord.utils.get(ctx.guild.roles, id=mod_role_id)
admin_role = discord.utils.get(ctx.guild.roles, id=admin_role_id)
@@ -45,7 +46,8 @@ def admin_or_permissions(**perms):
return has_perms_or_is_owner
author = ctx.author
is_guild_owner = author == ctx.guild.owner
admin_role = ctx.bot.db.guild(ctx.guild).admin_role()
admin_role_id = await ctx.bot.db.guild(ctx.guild).admin_role()
admin_role = discord.utils.get(ctx.guild.roles, id=admin_role_id)
return admin_role in author.roles or has_perms_or_is_owner or is_guild_owner