initial working update

This commit is contained in:
Will Tekulve
2016-02-27 04:02:32 -05:00
parent d565849a35
commit 563d7bb395
8 changed files with 205 additions and 133 deletions

View File

@@ -1,7 +1,8 @@
from discord.ext import commands
import discord.utils
import os.path
import json
from cogs.utils.settings import Settings
from cogs.utils.dataIO import fileIO
from __main__ import settings
#
# This is a modified version of checks.py, originally made by Rapptz
@@ -10,15 +11,8 @@ import json
# https://github.com/Rapptz/RoboDanny/tree/async
#
try:
with open("data/red/settings.json", "r") as f:
settings = json.loads(f.read())
except Exception as e:
print(e)
settings = {"OWNER" : False, "default":{"ADMIN_ROLE" : False, "MOD_ROLE" : False}}
def is_owner_check(ctx):
return ctx.message.author.id == settings["OWNER"]
return ctx.message.author.id == settings.owner
def is_owner():
return commands.check(is_owner_check)
@@ -33,17 +27,6 @@ def is_owner():
# the permissions required for them.
# Of course, the owner will always be able to execute commands.
def save_bot_settings(bot_settings=settings):
with open("data/red/settings.json", "w") as f:
f.write(json.dumps(bot_settings,sort_keys=True,indent=4,separators=(',',':')))
def update_old_settings():
mod = settings["MOD_ROLE"]
admin = settings["ADMIN_ROLE"]
del settings["MOD_ROLE"]
del settings["ADMIN_ROLE"]
settings["default"] = {"MOD_ROLE":mod,"ADMIN_ROLE":admin}
def check_permissions(ctx, perms):
if is_owner_check(ctx):
return True
@@ -67,30 +50,17 @@ def role_or_permissions(ctx, check, **perms):
def mod_or_permissions(**perms):
def predicate(ctx):
if "default" not in settings:
update_old_settings()
if admin_or_permissions(**perms):
return True
sid = ctx.message.server.id
if sid not in settings:
mod_role = settings["default"]["MOD_ROLE"].lower()
admin_role = settings["default"]["ADMIN_ROLE"].lower()
else:
mod_role = settings[sid]["MOD_ROLE"].lower()
admin_role = settings[sid]["ADMIN_ROLE"].lower()
server = ctx.message.server
mod_role = settings.get_server_mod(server)
admin_role = settings.get_server_admin(server)
return role_or_permissions(ctx, lambda r: r.name.lower() in (mod_role,admin_role), **perms)
return commands.check(predicate)
def admin_or_permissions(**perms):
def predicate(ctx):
if "default" not in settings:
update_old_settings()
sid = ctx.message.server.id
if sid not in settings:
admin_role = settings["default"]["ADMIN_ROLE"]
else:
admin_role = settings[sid]["ADMIN_ROLE"]
server = ctx.message.server
admin_role = settings.get_server_admin(server)
return role_or_permissions(ctx, lambda r: r.name.lower() == admin_role.lower(), **perms)
return commands.check(predicate)