From e57ca780ef21fd786fc9de1225e56357dcf1d922 Mon Sep 17 00:00:00 2001 From: Phxntxm Date: Mon, 3 Oct 2016 20:04:03 -0500 Subject: [PATCH] Cleaned up the join/leave methods --- bot.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bot.py b/bot.py index a0c266f..7414a7e 100644 --- a/bot.py +++ b/bot.py @@ -49,8 +49,10 @@ async def on_ready(): @bot.event async def on_member_join(member): - r_filter = {'server_id': member.server.id} + server = member.server + r_filter = {'server_id': server.id} notifications = await config.get_content('user_notifications', r_filter) + try: channel_id = notifications[0]['channel_id'] except TypeError: @@ -60,14 +62,16 @@ async def on_member_join(member): if not channel_id: return - channel = discord.utils.get(member.server.channels, id=notifications) + channel = server.get_channel(channel_id) await bot.send_message(channel, "Welcome to the '{0.server.name}' server {0.mention}!".format(member)) @bot.event async def on_member_remove(member): - r_filter = {'server_id': member.server.id} + server = member.server + r_filter = {'server_id': server.id} notifications = await config.get_content('user_notifications', r_filter) + try: channel_id = notifications[0]['channel_id'] except TypeError: @@ -77,7 +81,7 @@ async def on_member_remove(member): if not channel_id: return - channel = discord.utils.get(member.server.channels, id=channel_id) + channel = server.get_channel(channel_id) await bot.send_message(channel, "{0} has left the server, I hope it wasn't because of something I said :c".format( member.display_name))