CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cogs/bank/bank.py
View File

@ -5,20 +5,36 @@ from core.bot import Red # Only used for type hints
def check_global_setting_guildowner(): def check_global_setting_guildowner():
"""
Command decorator. If the bank is not global, it checks if the author is
either the guildowner or has the administrator permission.
"""
async def pred(ctx: commands.Context): async def pred(ctx: commands.Context):
if await bank.is_global(): author = ctx.author
return checks.is_owner() if await ctx.bot.is_owner(author):
else: return True
return checks.guildowner_or_permissions(administrator=True) if not await bank.is_global():
permissions = ctx.channel.permissions_for(author)
return author == ctx.guild.owner or permissions.administrator
return commands.check(pred) return commands.check(pred)
def check_global_setting_admin(): def check_global_setting_admin():
"""
Command decorator. If the bank is not global, it checks if the author is
either a bot admin or has the manage_guild permission.
"""
async def pred(ctx: commands.Context): async def pred(ctx: commands.Context):
if await bank.is_global(): author = ctx.author
return checks.is_owner() if await ctx.bot.is_owner(author):
else: return True
return checks.admin_or_permissions(manage_guild=True) if not await bank.is_global():
permissions = ctx.channel.permissions_for(author)
is_guild_owner = author == ctx.guild.owner
admin_role = await ctx.bot.db.guild(ctx.guild).admin_role()
return admin_role in author.roles or is_guild_owner or permissions.manage_guild
return commands.check(pred) return commands.check(pred)

8
core/checks.py
View File

@ -24,8 +24,9 @@ def mod_or_permissions(**perms):
if ctx.guild is None: if ctx.guild is None:
return has_perms_or_is_owner return has_perms_or_is_owner
author = ctx.author author = ctx.author
mod_role_id = ctx.bot.db.guild(ctx.guild).mod_role() settings = ctx.bot.db.guild(ctx.guild)
admin_role_id = ctx.bot.db.guild(ctx.guild).admin_role() 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) mod_role = discord.utils.get(ctx.guild.roles, id=mod_role_id)
admin_role = discord.utils.get(ctx.guild.roles, id=admin_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 return has_perms_or_is_owner
author = ctx.author author = ctx.author
is_guild_owner = author == ctx.guild.owner 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 return admin_role in author.roles or has_perms_or_is_owner or is_guild_owner

18
core/global_checks.py
View File

@ -1,3 +1,4 @@
"""The checks in this module run on every command."""
from discord.ext import commands from discord.ext import commands
@ -5,22 +6,26 @@ def init_global_checks(bot):
@bot.check @bot.check
async def global_perms(ctx): async def global_perms(ctx):
"""Check the user is/isn't globally whitelisted/blacklisted."""
if await bot.is_owner(ctx.author): if await bot.is_owner(ctx.author):
return True return True
if bot.db.whitelist(): whitelist = await bot.db.whitelist()
return ctx.author.id in bot.db.whitelist() if whitelist:
return ctx.author.id in whitelist
return ctx.author.id not in bot.db.blacklist() return ctx.author.id not in await bot.db.blacklist()
@bot.check @bot.check
async def local_perms(ctx: commands.Context): async def local_perms(ctx: commands.Context):
"""Check the user is/isn't locally whitelisted/blacklisted."""
if await bot.is_owner(ctx.author): if await bot.is_owner(ctx.author):
return True return True
elif ctx.message.guild is None: elif ctx.guild is None:
return True return True
local_blacklist = bot.db.guild(ctx.guild).blacklist() guild_settings = bot.db.guild(ctx.guild)
local_whitelist = bot.db.guild(ctx.guild).whitelist() local_blacklist = await guild_settings.blacklist()
local_whitelist = await guild_settings.whitelist()
if local_whitelist: if local_whitelist:
return ctx.author.id in local_whitelist return ctx.author.id in local_whitelist
@ -29,4 +34,5 @@ def init_global_checks(bot):
@bot.check @bot.check
async def bots(ctx): async def bots(ctx):
"""Check the user is not another bot."""
return not ctx.author.bot return not ctx.author.bot