add error handler(global level) and reformatting

Author: appi147

assets/meme_pic/xdoubt.png renamed to assets/pic/xdoubt.png

@@ -48,9 +48,11 @@ def setup_logging():
     'cogs.activity',
     'cogs.basic',
     'cogs.cricket',
-    'cogs.fun',
     'cogs.embed',
-    'cogs.meme_pic',
+    'cogs.emotes',
+    'cogs.error_handler',
+    'cogs.fun',
+    'cogs.pic',
     'cogs.poll',
     'cogs.react',
     'cogs.stock',

position5/__main__.py

@@ -10,6 +10,7 @@
 
 
 EMOTES_PATH = 'assets/emotes/'
+PIC_PATH = 'assets/pic/'
 
 DISCLAIMER = '''
 I am NOT a SEBI registered advisor or a financial adviser.

position5/cogs/__init__.py

@@ -5,7 +5,7 @@
 from . import EMOTES_PATH, delete_message, log_params
 
 
-class MemePic(commands.Cog):
+class Emotes(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
         self._refresh_emotes()
@@ -20,12 +20,6 @@ def _refresh_emotes(self):
             emote.split('.', 1)[0].lower(): emote for emote in self.emotes
         }
 
-    @commands.command(name='xdoubt', description='xdoubt pic')
-    @delete_message()
-    @log_params()
-    async def xdoubt_command(self, ctx):
-        await ctx.send(file=discord.File('assets/meme_pic/xdoubt.png'))
-
     @commands.command(name='emote', description='emote as pictures', usage='<emote>')
     @delete_message()
     @log_params()
@@ -88,4 +82,4 @@ async def emotes_command(self, ctx, *, search: str = None):
 
 
 def setup(bot):
-    bot.add_cog(MemePic(bot))
+    bot.add_cog(Emotes(bot))

position5/cogs/meme_pic.py renamed to position5/cogs/emotes.py

@@ -0,0 +1,56 @@
+import logging
+from discord.ext import commands
+
+log = logging.getLogger('position5.error_handler')
+
+
+class ErrorHandler(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.Cog.listener()
+    async def on_command_error(self, ctx, error):
+        """The event triggered when an error is raised while invoking a command.
+        Parameters
+        ------------
+        ctx: commands.Context
+            The context used for command invocation.
+        error: commands.CommandError
+            The Exception raised.
+        """
+
+        # This prevents any commands with local handlers being handled here in on_command_error.
+        if hasattr(ctx.command, 'on_error'):
+            return
+
+        # Allows us to check for original exceptions raised and sent to CommandInvokeError.
+        # If nothing is found. We keep the exception passed to on_command_error.
+        error = getattr(error, 'original', error)
+
+        if isinstance(error, commands.CommandNotFound):
+            log.info(
+                'Command Not Found | Message: %s | Author: %s',
+                ctx.message.content,
+                ctx.author.name,
+            )
+
+        # elif isinstance(error, commands.DisabledCommand):
+        #     await ctx.send(f'{ctx.command} has been disabled.')
+
+        # elif isinstance(error, commands.NoPrivateMessage):
+        #     try:
+        #         await ctx.author.send(f'{ctx.command} can not be used in Private Messages.')
+        #     except discord.HTTPException:
+        #         pass
+
+        # elif isinstance(error, commands.BadArgument):
+        #     if ctx.command.qualified_name == 'tag list':
+        #         await ctx.send('I could not find that member. Please try again.')
+
+        else:
+            log.info('Exception in command %s', ctx.command)
+            log.error('Type %s | Error: %s', type(error), error)
+
+
+def setup(bot):
+    bot.add_cog(ErrorHandler(bot))

position5/cogs/error_handler.py

@@ -0,0 +1,18 @@
+import discord
+from discord.ext import commands
+from . import delete_message, log_params, PIC_PATH
+
+
+class Pic(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.command(name='xdoubt', description='xdoubt pic')
+    @delete_message()
+    @log_params()
+    async def xdoubt_command(self, ctx):
+        await ctx.send(file=discord.File(f'{PIC_PATH}xdoubt.png'))
+
+
+def setup(bot):
+    bot.add_cog(Pic(bot))

position5/cogs/pic.py

@@ -15,7 +15,7 @@ async def poll_without_options(self, ctx, *, question):
         reactions = ['✅', '❌', '💤']
         embed = (
             discord.Embed(title=question)
-            .set_footer(text='Poll will end in 100 seconds! Please react once.')
+            .set_footer(text='Poll will end in 30 seconds! Please react once.')
             .set_author(
                 name=ctx.message.author.name, icon_url=ctx.message.author.avatar_url
             )
@@ -24,7 +24,7 @@ async def poll_without_options(self, ctx, *, question):
         for reaction in reactions:
             await message.add_reaction(reaction)
 
-        await asyncio.sleep(10)
+        await asyncio.sleep(30)
 
         total_count = -3
         reaction_count = {}