From 2171c3075f8abd133f65dcee26302ddaa61d42aa Mon Sep 17 00:00:00 2001 From: Taaku18 <45324516+Taaku18@users.noreply.github.com> Date: Sun, 12 May 2019 22:33:40 -0700 Subject: [PATCH] minor code refactor --- bot.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/bot.py b/bot.py index f4e32b0cf0..58472b63b1 100644 --- a/bot.py +++ b/bot.py @@ -111,7 +111,6 @@ def __init__(self): self.metadata_task = self.loop.create_task(self.metadata_loop()) self.autoupdate_task = self.loop.create_task(self.autoupdate_loop()) self._load_extensions() - self.owner = None def _configure_logging(self): level_text = self.config.log_level.upper() @@ -934,7 +933,7 @@ async def autoupdate_loop(self): embed.add_field(name='Merge Commit', value=f"[`{short_sha}`]({html_url}) " f"{message} - {user['username']}") - logger.info(info('Updating bot.')) + logger.info(info('Bot has been updated.')) channel = self.log_channel await channel.send(embed=embed) @@ -942,12 +941,12 @@ async def autoupdate_loop(self): async def metadata_loop(self): await self.wait_until_ready() - self.owner = (await self.application_info()).owner + owner = (await self.application_info()).owner while not self.is_closed(): data = { - "owner_name": str(self.owner), - "owner_id": self.owner.id, + "owner_name": str(owner), + "owner_id": owner.id, "bot_id": self.user.id, "bot_name": str(self.user), "avatar_url": self.user.avatar_url, @@ -962,13 +961,9 @@ async def metadata_loop(self): "last_updated": str(datetime.utcnow()) } - - try: - await self.session.post('https://api.modmail.tk/metadata', json=data) + async with self.session.post('https://api.modmail.tk/metadata', json=data): logger.debug(info('Uploading metadata to Modmail server.')) - except: - pass - + await asyncio.sleep(3600)