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

Remove from __main__ import ... statements (#1956)

Browse Source
This commit is contained in:
Caleb Johnson
2018-12-15 20:17:46 -06:00
committed by Toby Harradine
parent e874e6aa01
commit a42c4fb215
8 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cogs/utils/checks.py
View File

@@ -1,6 +1,5 @@
from discord.ext import commands
import discord.utils
from __main__ import settings
#
# This is a modified version of checks.py, originally made by Rapptz
@@ -11,7 +10,7 @@ from __main__ import settings
def is_owner_check(ctx):
_id = ctx.message.author.id
return _id == settings.owner or _id in ctx.bot.settings.co_owners
return _id == ctx.bot.settings.owner or _id in ctx.bot.settings.co_owners
def is_owner():
return commands.check(is_owner_check)
@@ -52,8 +51,8 @@ def role_or_permissions(ctx, check, **perms):
def mod_or_permissions(**perms):
def predicate(ctx):
server = ctx.message.server
mod_role = settings.get_server_mod(server).lower()
admin_role = settings.get_server_admin(server).lower()
mod_role = ctx.bot.settings.get_server_mod(server).lower()
admin_role = ctx.bot.settings.get_server_admin(server).lower()
return role_or_permissions(ctx, lambda r: r.name.lower() in (mod_role,admin_role), **perms)
return commands.check(predicate)
@@ -61,7 +60,7 @@ def mod_or_permissions(**perms):
def admin_or_permissions(**perms):
def predicate(ctx):
server = ctx.message.server
admin_role = settings.get_server_admin(server)
admin_role = ctx.bot.settings.get_server_admin(server)
return role_or_permissions(ctx, lambda r: r.name.lower() == admin_role.lower(), **perms)
return commands.check(predicate)