Browse Source

added more cleaning up of settings

tags/v2.0.0
Roxie Gibson 5 years ago
parent
commit
d862c06d77
4 changed files with 29 additions and 1 deletions
  1. +12
    -1
      roxbot/cogs/joinleave.py
  2. +1
    -0
      roxbot/cogs/selfassign.py
  3. +8
    -0
      roxbot/cogs/twitch.py
  4. +8
    -0
      roxbot/logging.py

+ 12
- 1
roxbot/cogs/joinleave.py View File

"enabled": 0, "enabled": 0,
"convert": {"enabled": "bool", "welcome-channel": "channel"}, "convert": {"enabled": "bool", "welcome-channel": "channel"},
"welcome-channel": 0, "welcome-channel": 0,
"member-role": "",
"custom-message": "", "custom-message": "",
"default-message": "Be sure to read the rules." "default-message": "Be sure to read the rules."
}, },
return await channel.send(embed=discord.Embed( return await channel.send(embed=discord.Embed(
description="{}#{} has left or been beaned.".format(member.name, member.discriminator), colour=roxbot.EmbedColours.pink)) 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.guild_only()
@commands.has_permissions(manage_messages=True) @commands.has_permissions(manage_messages=True)
@commands.command() @commands.command()

+ 1
- 0
roxbot/cogs/selfassign.py View File

} }


async def on_guild_role_delete(self, role): async def on_guild_role_delete(self, role):
"""Cleans up settings on removal of stored IDs."""
settings = gs.get(role.guild) settings = gs.get(role.guild)
sa = settings["self_assign"] sa = settings["self_assign"]
for sa_role in sa["roles"]: for sa_role in sa["roles"]:

+ 8
- 0
roxbot/cogs/twitch.py View File

} }
} }


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): async def on_member_update(self, member_b, member_a):
"""Twitch Shilling Part""" """Twitch Shilling Part"""
twitch = roxbot.guild_settings.get(member_b.guild)["twitch"] twitch = roxbot.guild_settings.get(member_b.guild)["twitch"]

+ 8
- 0
roxbot/logging.py View File

} }
} }


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): async def on_member_join(self, member):
logging = guild_settings.get(member.guild)["logging"] logging = guild_settings.get(member.guild)["logging"]
if logging["enabled"]: if logging["enabled"]:

Loading…
Cancel
Save