fixed is_anal check and now is naunced to only work in nsfw chats.

checks.py

@@ -37,14 +37,13 @@ def nsfw_predicate(ctx):
 	elif nsfw["enabled"] and nsfw["channels"]:
 		return ctx.message.channel.id in nsfw["channels"]
 	else:
-		print("yo")
 		return False
 
 def is_nfsw_enabled():
 	return commands.check(lambda ctx: nsfw_predicate(ctx))
 
-def is_anal():
-	return commands.check(lambda ctx: ServerConfig().load_config()[ctx.message.server.id]["is_anal"]["y/n"])
+def isnt_anal():
+	return commands.check(lambda ctx: ServerConfig().load_config()[ctx.message.server.id]["is_anal"]["y/n"] and nsfw_predicate(ctx) or not ServerConfig().load_config()[ctx.message.server.id]["is_anal"]["y/n"])
 
 def not_pm():
 	return commands.check(lambda ctx: ctx.message.channel.type != discord.ChannelType.private)

cogs/fun.py

@@ -51,7 +51,7 @@ class Fun():
 			roll = random.randrange(step, dice + 1, step)
 			return await self.bot.say("{} rolled a **{}**".format(ctx.message.author.mention, roll))
 
-	@checks.is_anal()
+	@checks.isnt_anal()
 	@bot.command(pass_context=True)
 	async def spank(self, ctx, *, user: discord.User = None):
 		"""
@@ -64,7 +64,7 @@ class Fun():
 			return await self.bot.say("You didn't mention someone for me to spank")
 		return await self.bot.say(":peach: :wave: *{} spanks {}*".format(self.bot.user.name, user.name))
 
-	@checks.is_anal()
+	@checks.isnt_anal()
 	@bot.command(pass_context=True, aliases=["succ"])
 	async def suck(self, ctx, *, user: discord.User = None):
 		"""

cogs/settings.py

@@ -167,7 +167,6 @@ class Settings():
 		em.set_author(name="{} settings for {}.".format(self.bot.user.name, ctx.message.server.name), icon_url=self.bot.user.avatar_url)
 
 		for settings in config:
-			print(settings)
 			if settings != "custom_commands" and settings != "warnings":
 				settingcontent = ""
 				for x in config[settings].items():
@@ -353,13 +352,13 @@ class Settings():
 	@bot.command(pass_context=True)
 	async def serverisanal(self, ctx):
 		self.servers = self.con.load_config()
-		is_anal = self.servers[ctx.message.server.id]["is_anal"]
-		if is_anal:
-			self.servers[ctx.message.server.id]["is_anal"]["y/n"] = 0
+		is_anal = self.servers[ctx.message.server.id]["is_anal"]["y/n"]
+		if is_anal == 0:
+			self.servers[ctx.message.server.id]["is_anal"]["y/n"] = 1
 			self.con.update_config(self.servers)
 			return await self.bot.say("I now know this server is anal")
 		else:
-			self.servers[ctx.message.server.id]["is_anal"]["y/n"] = 1
+			self.servers[ctx.message.server.id]["is_anal"]["y/n"] = 0
 			self.con.update_config(self.servers)
 			return await self.bot.say("I now know this server is NOT anal")
 

config/servers.json

@@ -1 +1 @@
-{"304048071963312130": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "hellow", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "self_assign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}, "mute": {"role": "", "admin-role": []}, "nsfw": {"enabled": 1, "channels": ["374688008869511168"]}, "admin_role": {"role": ""}, "custom_commands": {"0": {"test": "\"testedit\"", "hello": "<:tingles:346838411639914506>", "benis": "\ud83c\udd71enis", "sophie": "<@136619052994002944>", "myra": "<@342213251372941312>", "roxieee": "<@!142735312626515979>", "customs": "\"\ud83d\udec3\"", "zzz": "\ud83d\udca4", "lewd!": "\ud83d\udea8 lewd! \ud83d\udea8"}, "1": {}}, "perm_roles": {"admin": ["334078005347483648"], "mod": []}, "gss": {"logging_channel": "339201847678074880", "required_days": "5", "required_score": "3000000", "log_channel": ""}, "admin": {"warnings": {}}, "is_anal": {"y/n": 0}, "warnings": {"259869304369971200": [{"warned-by": "142735312626515979", "date": 1518514436.672631, "warning": "Hello"}, {"warned-by": "142735312626515979", "date": 1518514441.1129122, "warning": "Hello"}, {"warned-by": "142735312626515979", "date": 1518514442.534168, "warning": "Hello"}], "104291668810821632": [{"warned-by": "142735312626515979", "date": 1518519612.6708424, "warning": "For being a bad girl"}]}}, "395632940328943616": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "self_assign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}, "nsfw": {"enabled": 0, "channels": []}, "perm_roles": {"admin": [], "mod": []}, "custom_commands": {"0": {}, "1": {}}, "gss": {"log_channel": "", "required_days": "", "required_score": ""}, "warnings": {}, "is_anal": {"y/n": 0}}}
+{"304048071963312130": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "hellow", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "self_assign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}, "mute": {"role": "", "admin-role": []}, "nsfw": {"enabled": 1, "channels": ["374688008869511168"]}, "admin_role": {"role": ""}, "custom_commands": {"0": {"test": "\"testedit\"", "hello": "<:tingles:346838411639914506>", "benis": "\ud83c\udd71enis", "sophie": "<@136619052994002944>", "myra": "<@342213251372941312>", "roxieee": "<@!142735312626515979>", "customs": "\"\ud83d\udec3\"", "zzz": "\ud83d\udca4", "lewd!": "\ud83d\udea8 lewd! \ud83d\udea8"}, "1": {}}, "perm_roles": {"admin": ["334078005347483648"], "mod": []}, "gss": {"logging_channel": "339201847678074880", "required_days": "5", "required_score": "3000000", "log_channel": ""}, "admin": {"warnings": {}}, "is_anal": {"y/n": 1}, "warnings": {"259869304369971200": [{"warned-by": "142735312626515979", "date": 1518514436.672631, "warning": "Hello"}, {"warned-by": "142735312626515979", "date": 1518514441.1129122, "warning": "Hello"}, {"warned-by": "142735312626515979", "date": 1518514442.534168, "warning": "Hello"}], "104291668810821632": [{"warned-by": "142735312626515979", "date": 1518519612.6708424, "warning": "For being a bad girl"}]}}, "395632940328943616": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "self_assign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}, "nsfw": {"enabled": 0, "channels": []}, "perm_roles": {"admin": [], "mod": []}, "custom_commands": {"0": {}, "1": {}}, "gss": {"log_channel": "", "required_days": "", "required_score": ""}, "warnings": {}, "is_anal": {"y/n": 0}}}