added more cleaning up of settings

roxbot/cogs/joinleave.py

@@ -41,7 +41,6 @@ class JoinLeave():
 					"enabled": 0,
 					"convert": {"enabled": "bool", "welcome-channel": "channel"},
 					"welcome-channel": 0,
-					"member-role": "",
 					"custom-message": "",
 					"default-message": "Be sure to read the rules."
 					},
@@ -86,6 +85,18 @@ class JoinLeave():
 			return await channel.send(embed=discord.Embed(
 				description="{}#{} has left or been beaned.".format(member.name, member.discriminator), colour=roxbot.EmbedColours.pink))
 
+	async def on_guild_channel_delete(self, channel):
+		"""Cleans up settings on removal of stored IDs."""
+		settings = guild_settings.get(channel.guild)
+		greets = settings["greets"]
+		goodbyes = settings["goodbyes"]
+		if channel.id == greets["welcome-channel"]:
+			greets["welcome-channel"] = 0
+			settings.update(greets, "greets")
+		if channel.id == goodbyes["goodbye-channel"]:
+			goodbyes["goodbye-channel"] = 0
+			settings.update(goodbyes, "goodbyes")
+
 	@commands.guild_only()
 	@commands.has_permissions(manage_messages=True)
 	@commands.command()

roxbot/cogs/selfassign.py

@@ -43,6 +43,7 @@ class SelfAssign():
 		}
 
 	async def on_guild_role_delete(self, role):
+		"""Cleans up settings on removal of stored IDs."""
 		settings = gs.get(role.guild)
 		sa = settings["self_assign"]
 		for sa_role in sa["roles"]:

roxbot/cogs/twitch.py

@@ -48,6 +48,14 @@ class Twitch():
 			}
 		}
 
+	async def on_guild_channel_delete(self, channel):
+		"""Cleans up settings on removal of stored IDs."""
+		settings = roxbot.guild_settings.get(channel.guild)
+		twitch = settings["twitch"]
+		if channel.id == twitch["channel"]:
+			twitch["channel"] = 0
+			settings.update(twitch, "twitch")
+
 	async def on_member_update(self, member_b, member_a):
 		"""Twitch Shilling Part"""
 		twitch = roxbot.guild_settings.get(member_b.guild)["twitch"]

roxbot/logging.py

@@ -67,6 +67,14 @@ class Logging:
 			}
 		}
 
+	async def on_guild_channel_delete(self, channel):
+		"""Cleans up settings on removal of stored IDs."""
+		settings = roxbot.guild_settings.get(channel.guild)
+		logging = settings["logging"]
+		if channel.id == logging["channel"]:
+			logging["channel"] = 0
+			settings.update(logging, "logging")
+
 	async def on_member_join(self, member):
 		logging = guild_settings.get(member.guild)["logging"]
 		if logging["enabled"]: