Don't try to do anything if server has no settings
This commit is contained in:
parent
0fe4d06b59
commit
ef912ef7b8
|
@ -83,12 +83,13 @@ AND
|
||||||
COALESCE(welcome_alerts, default_alerts) IS NOT NULL
|
COALESCE(welcome_alerts, default_alerts) IS NOT NULL
|
||||||
"""
|
"""
|
||||||
settings = await self.bot.db.fetchrow(query, member.guild.id)
|
settings = await self.bot.db.fetchrow(query, member.guild.id)
|
||||||
message = settings['msg'] or "Welcome to the '{server}' server {member}!"
|
if settings:
|
||||||
channel = member.guild.get_channel(settings['channel'])
|
message = settings['msg'] or "Welcome to the '{server}' server {member}!"
|
||||||
try:
|
channel = member.guild.get_channel(settings['channel'])
|
||||||
await channel.send(message.format(server=member.guild.name, member=member.mention))
|
try:
|
||||||
except (discord.Forbidden, discord.HTTPException, AttributeError):
|
await channel.send(message.format(server=member.guild.name, member=member.mention))
|
||||||
pass
|
except (discord.Forbidden, discord.HTTPException, AttributeError):
|
||||||
|
pass
|
||||||
|
|
||||||
async def on_member_remove(self, member):
|
async def on_member_remove(self, member):
|
||||||
query = """
|
query = """
|
||||||
|
@ -105,12 +106,13 @@ AND
|
||||||
COALESCE(goodbye_alerts, default_alerts) IS NOT NULL
|
COALESCE(goodbye_alerts, default_alerts) IS NOT NULL
|
||||||
"""
|
"""
|
||||||
settings = await self.bot.db.fetchrow(query, member.guild.id)
|
settings = await self.bot.db.fetchrow(query, member.guild.id)
|
||||||
message = settings['msg'] or "{member} has left the server, I hope it wasn't because of something I said :c"
|
if settings:
|
||||||
channel = member.guild.get_channel(settings['channel'])
|
message = settings['msg'] or "{member} has left the server, I hope it wasn't because of something I said :c"
|
||||||
try:
|
channel = member.guild.get_channel(settings['channel'])
|
||||||
await channel.send(message.format(server=member.guild.name, member=member.mention))
|
try:
|
||||||
except (discord.Forbidden, discord.HTTPException, AttributeError):
|
await channel.send(message.format(server=member.guild.name, member=member.mention))
|
||||||
pass
|
except (discord.Forbidden, discord.HTTPException, AttributeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def setup(bot):
|
def setup(bot):
|
||||||
|
|
Loading…
Reference in a new issue