1
0
Fork 0
mirror of synced 2024-06-23 08:40:41 +12:00

Moved events to their own cog

This commit is contained in:
phxntxm 2016-10-30 23:32:33 -05:00
parent c4c3e03c39
commit 5cd4ad7862
2 changed files with 37 additions and 41 deletions

40
bot.py
View file

@ -31,46 +31,6 @@ async def on_ready():
bot.uptime = pendulum.utcnow()
@bot.event
async def on_member_join(member):
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:
return
# By default, notifications should be off unless explicitly turned on
if not channel_id:
return
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):
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:
return
# By default, notifications should be off unless explicitly turned on
if not channel_id:
return
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))
@bot.event
async def on_message(message):
if message.author.bot:

View file

@ -33,7 +33,7 @@ class StatsUpdate:
async with self.session.post(carbonitex_url, data=carbon_payload) as resp:
log.info('Carbonitex statistics returned {} for {}'.format(resp.status, carbon_payload))
payload = json.dumps({
'server_count': server_count
})
@ -77,6 +77,42 @@ class StatsUpdate:
await config.add_content('bot_data', entry, r_filter)
self.bot.loop.create_task(self.update())
async def on_member_join(self, member):
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:
return
# By default, notifications should be off unless explicitly turned on
if not channel_id:
return
channel = server.get_channel(channel_id)
await self.bot.send_message(channel, "Welcome to the '{0.server.name}' server {0.mention}!".format(member))
async def on_member_remove(self, member):
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:
return
# By default, notifications should be off unless explicitly turned on
if not channel_id:
return
channel = server.get_channel(channel_id)
await self.bot.send_message(channel,
"{0} has left the server, I hope it wasn't because of something I said :c".format(
member.display_name))
def setup(bot):
bot.add_cog(StatsUpdate(bot))