Converted over the checks file so it checks the new settings objects.

Roxbot/checks.py

@@ -1,6 +1,6 @@
 from discord.ext import commands
 from Roxbot import load_config
-from Roxbot.settings.guild_settings import ServerConfig
+from Roxbot.settings import guild_settings as gs
 
 def is_owner_or_admin():
 	def predicate(ctx):
@@ -8,7 +8,7 @@ def is_owner_or_admin():
 			return True
 		else:
 			for role in ctx.author.roles:
-				if role.id in ServerConfig().load_config()[str(ctx.guild.id)]["perm_roles"]["admin"]:
+				if role.id in gs.get(ctx.guild).perm_roles["admin"]:
 					return True
 		return False
 	return commands.check(predicate)
@@ -18,8 +18,8 @@ def is_admin_or_mod():
 		if ctx.message.author.id == load_config.owner:
 			return True
 		else:
-			admin_roles =  ServerConfig().load_config()[str(ctx.guild.id)]["perm_roles"]["admin"]
-			mod_roles = ServerConfig().load_config()[str(ctx.guild.id)]["perm_roles"]["mod"]
+			admin_roles =  gs.get(ctx.guild).perm_roles["admin"]
+			mod_roles = gs.get(ctx.guild).perm_roles["mod"]
 			for role in ctx.author.roles:
 				if role.id in mod_roles or role.id in admin_roles:
 					return True
@@ -27,7 +27,7 @@ def is_admin_or_mod():
 	return commands.check(predicate)
 
 def nsfw_predicate(ctx):
-	nsfw = ServerConfig().load_config()[str(ctx.guild.id)]["nsfw"]
+	nsfw = gs.get(ctx.guild).nsfw
 	if not nsfw["channels"] and nsfw["enabled"]:
 		return nsfw["enabled"] == 1
 	elif nsfw["enabled"] and nsfw["channels"]:
@@ -39,4 +39,4 @@ def is_nfsw_enabled():
 	return commands.check(lambda ctx: nsfw_predicate(ctx))
 
 def isnt_anal():
-	return commands.check(lambda ctx: ServerConfig().load_config()[str(ctx.guild.id)]["is_anal"]["y/n"] and nsfw_predicate(ctx) or not ServerConfig().load_config()[str(ctx.guild.id)]["is_anal"]["y/n"])
+	return commands.check(lambda ctx: gs.get(ctx.guild).is_anal["y/n"] and nsfw_predicate(ctx) or not gs.get(ctx.guild).is_anal["y/n"])