From 881b29a22d28cc43f9b6342cee5bbe1c110d2ba1 Mon Sep 17 00:00:00 2001
From: Myned <alphasea14@gmail.com>
Date: Mon, 20 Nov 2017 08:45:39 -0500
Subject: [PATCH] Fixed startup reactions not working properly and cleaned
 represenation

---
 src/main/cogs/owner.py | 12 ++++++------
 src/main/run.py        | 34 ++++++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/main/cogs/owner.py b/src/main/cogs/owner.py
index 004027c..2b21810 100644
--- a/src/main/cogs/owner.py
+++ b/src/main/cogs/owner.py
@@ -29,9 +29,9 @@ class Bot:
 
         await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** \N{CRESCENT MOON} . . .')
 
-        u.temp['startup_chan'] = ctx.channel.id
-        u.temp['startup_msg'] = ctx.message.id
-        u.dump(u.temp, 'temp.pkl')
+        chantype = 'guild' if isinstance(ctx.channel, d.TextChannel) else 'private'
+        u.temp['startup'] = (chantype, ctx.channel.id if chantype == 'guild' else ctx.author.id, ctx.message.id)
+        u.dump(u.temp, 'temp/temp.pkl')
 
         # loop = self.bot.loop.all_tasks()
         # for task in loop:
@@ -50,9 +50,9 @@ class Bot:
         await self.bot.get_channel(u.config['info_channel']).send('**Restarting** \N{SLEEPING SYMBOL} . . .')
         # u.notify('R E S T A R T I N G')
 
-        u.temp['startup_chan'] = ctx.channel.id
-        u.temp['startup_msg'] = ctx.message.id
-        u.dump(u.temp, 'temp.pkl')
+        chantype = 'guild' if isinstance(ctx.channel, d.TextChannel) else 'private'
+        u.temp['startup'] = (chantype, ctx.channel.id if chantype == 'guild' else ctx.author.id, ctx.message.id)
+        u.dump(u.temp, 'temp/temp.pkl')
 
         # loop = self.bot.loop.all_tasks()
         # for task in loop:
diff --git a/src/main/run.py b/src/main/run.py
index bd83575..aecb20e 100644
--- a/src/main/run.py
+++ b/src/main/run.py
@@ -54,7 +54,9 @@ log.basicConfig(level=log.WARNING)
 
 
 def get_prefix(bot, message):
-    return u.settings['prefixes'].get(message.guild.id, u.config['prefix'])
+    with suppress(AttributeError):
+        return u.settings['prefixes'].get(message.guild.id, u.config['prefix'])
+    return u.config['prefix']
 
 bot = cmds.Bot(command_prefix=get_prefix, formatter=cmds.HelpFormatter(show_check_failure=True), description='Modumind - A booru bot with a side of management\n\nS for single command\nG for group command', help_attrs={'aliases': ['h']}, pm_help=None)
 
@@ -84,10 +86,17 @@ async def on_ready():
     await bot.get_channel(u.config['info_channel']).send('**Started** \N{BLACK SUN WITH RAYS} .')
     # u.notify('C O N N E C T E D')
     if u.temp:
-        channel = bot.get_channel(u.temp['startup_chan'])
-        message = await channel.get_message(u.temp['startup_msg'])
-        await message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
-        u.temp.clear()
+        with suppress(err.NotFound):
+            if u.temp['startup'][0] == 'guild':
+                dest = bot.get_channel(u.temp['startup'][1])
+            else:
+                dest = bot.get_user(u.temp['startup'][1])
+            message = await dest.get_message(u.temp['startup'][2])
+
+            await message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
+
+        u.temp['startup'] = ()
+        u.dump(u.temp, 'temp/temp.pkl')
 
 
 @bot.event
@@ -102,11 +111,20 @@ async def on_error(error, *args, **kwargs):
     tb.print_exc()
     await bot.get_user(u.config['owner_id']).send('**ERROR** \N{WARNING SIGN}\n```\n{}```'.format(error))
     await bot.get_channel(u.config['info_channel']).send('**ERROR** \N{WARNING SIGN}\n```\n{}```'.format(error))
+
     if u.temp:
-        channel = bot.get_channel(u.temp['startup_chan'])
-        message = await channel.get_message(u.temp['startup_msg'])
-        await message.add_reaction('\N{WARNING SIGN}')
+        with suppress(err.NotFound):
+            print(u.temp['startup'])
+            if u.temp['startup'][0] == 'guild':
+                dest = bot.get_channel(u.temp['startup'][1])
+            else:
+                dest = bot.get_user(u.temp['startup'][1])
+            message = await dest.get_message(u.temp['startup'][2])
+
+            await message.add_reaction('\N{WARNING SIGN}')
+
         u.temp.clear()
+        u.dump(u.temp, 'temp/temp.pkl')
     # u.notify('E R R O R')
     await bot.logout()
     u.close(bot.loop)