From 504567a33442b9dd1ec24946e7f932aa48fef0a8 Mon Sep 17 00:00:00 2001
From: Adriene Hutchins <ustin.a.h+github@gmail.com>
Date: Mon, 2 Mar 2020 15:47:58 -0500
Subject: [PATCH] Turned extend into command group

---
 extensions/__pycache__/core.cpython-38.pyc | Bin 6245 -> 6599 bytes
 extensions/core.py                         |  64 +++++++++++----------
 extensions/developer.py                    |   2 +
 main.py                                    |  17 +++++-
 4 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/extensions/__pycache__/core.cpython-38.pyc b/extensions/__pycache__/core.cpython-38.pyc
index 74bd1c3cf1d6aa1b791e9fa17f409ab719c96d12..1b06e3fd6e66ee26717f962144c849d872e499e0 100644
GIT binary patch
delta 3133
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
U{NI&>LqhGT!}6~TPvY193(W}PEdT%j

delta 2799
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
bUTjKr(~aVIYDFvREwCPXAl^!?p=<sD^@MjJ

diff --git a/extensions/core.py b/extensions/core.py
index bcd6683..574cbf5 100644
--- a/extensions/core.py
+++ b/extensions/core.py
@@ -24,10 +24,8 @@ class Core(commands.Cog):
 
         # Main Stuff
         self.bot = bot
+        self.extensions_list = bot.extensions_list
         self.emoji = "\U0001F4E6"
-        self.settings = {
-            'extensions': []
-        }
 
         # Help Command
         self._original_help_command = bot.help_command
@@ -35,21 +33,6 @@ class Core(commands.Cog):
             bot.help_command = TaciHelpCommand()
         bot.help_command.cog = self
 
-        # Extensions
-        self._init_extensions()
-
-    def _init_extensions(self):
-        """Initializes extensions."""
-
-        for ext in os.listdir('extensions'):
-            if ext.endswith('.py') and not ext.startswith('core'):
-                try:
-                    self.bot.load_extension(f'extensions.{ext[:-3]}')
-                    self.settings['extensions'].append(
-                        f'extensions.{ext[:-3]}')
-                except:
-                    pass
-
     def _humanbytes(self, B) -> str:  # function lifted from StackOverflow
         """Return the given bytes as a human friendly KB, MB, GB, or TB string."""
 
@@ -129,16 +112,37 @@ Number of extensions present: {len(ctx.bot.cogs)}
         ping = (after - before) * 1000
         await pong.edit(content="`PING discordapp.com {}ms`".format(int(ping)))
 
-    @commands.command()
+    @commands.group(aliases=['extensions', 'ext'], 
+                    invoke_without_command=True)
+    @commands.is_owner()
+    async def extend(self, ctx, name:str = None):
+
+        # Provides status of extension
+        if name is not None:
+            status = "is" if f'extensions.{name}' in self.extensions_list else "is not"
+            msg = f"**extensions.{name}** {status} currently loaded and/or existent."
+
+        # Handles empty calls
+        else:
+            msg = (
+                "**Nothing was provided!**\n\n"
+                "Please provide an extension name for status, "
+                "or provide a subcommand."
+            )
+
+        # Sends completed message
+        await ctx.send(msg)
+
+    @extend.command(aliases=['le', 'l'])
     @commands.is_owner()
     async def load(self, ctx, name: str):
         """Load an extension into the bot."""
         m = await ctx.send(f'Loading {name}')
-        extension_name = 'extensions.{0}'.format(name)
-        if extension_name not in self.settings['extensions']:
+        extension_name = f'extensions.{name}'
+        if extension_name not in self.extensions_list:
             try:
                 self.bot.load_extension(extension_name)
-                self.settings['extensions'].append(extension_name)
+                self.extensions_list.append(extension_name)
                 await m.edit(content='Extension loaded.')
             except Exception as e:
                 await m.edit(
@@ -146,34 +150,34 @@ Number of extensions present: {len(ctx.bot.cogs)}
         else:
             await m.edit(content='Extension already loaded.')
 
-    @commands.command(aliases=["ule", "ul"])
+    @extend.command(aliases=["ule", "ul"])
     @commands.is_owner()
     async def unload(self, ctx, name: str):
         """Unload an extension from the bot."""
 
         m = await ctx.send(f'Unloading {name}')
-        extension_name = 'extensions.{0}'.format(name)
-        if extension_name in self.settings['extensions']:
+        extension_name = f'extensions.{name}'
+        if extension_name in self.extensions_list:
             self.bot.unload_extension(extension_name)
-            self.settings['extensions'].remove(extension_name)
+            self.extensions_list.remove(extension_name)
             await m.edit(content='Extension unloaded.')
         else:
             await m.edit(content='Extension not found or not loaded.')
 
-    @commands.command(aliases=["rle", "rl"])
+    @extend.command(aliases=["rle", "rl"])
     @commands.is_owner()
     async def reload(self, ctx, name: str):
         """Reload an extension of the bot."""
 
         m = await ctx.send(f'Reloading {name}')
-        extension_name = 'extensions.{0}'.format(name)
-        if extension_name in self.settings['extensions']:
+        extension_name = f'extensions.{name}'
+        if extension_name in self.extensions_list:
             self.bot.unload_extension(extension_name)
             try:
                 self.bot.load_extension(extension_name)
                 await m.edit(content='Extension reloaded.')
             except Exception as e:
-                self.settings['extensions'].remove(extension_name)
+                self.extensions_list.remove(extension_name)
                 await m.edit(
                     content=f'Failed to reload extension\n`{type(e).__name__}: {e}`')
         else:
diff --git a/extensions/developer.py b/extensions/developer.py
index 1937081..99c63db 100644
--- a/extensions/developer.py
+++ b/extensions/developer.py
@@ -38,6 +38,7 @@ class Developer(commands.Cog):
 
     def _cleanup_code(self, content):
         """Automatically removes code blocks from the code."""
+
         # remove ```py\n```
         if content.startswith('```') and content.endswith('```'):
             return '\n'.join(content.split('\n')[1:-1])
@@ -47,6 +48,7 @@ class Developer(commands.Cog):
 
     def _get_syntax_error(self, err):
         """Returns SyntaxError formatted for repl reply."""
+
         return '```py\n{0.text}{1:>{0.offset}}\n{2}: {0}```'.format(
             err,
             '^',
diff --git a/main.py b/main.py
index cd0b904..203bdb7 100644
--- a/main.py
+++ b/main.py
@@ -29,7 +29,8 @@ class Bot(commands.Bot):
         # Initializes parent class
         super().__init__(self._get_prefix_new, **options)
 
-        # Get Config Values
+        # Setup
+        self.extensions_list = []
         with open('config.json') as f:
             self.config = json.load(f)
             self.prefix = self.config['PREFIX']
@@ -45,6 +46,18 @@ class Bot(commands.Bot):
         # Logging
         print('Initialization complete.\n\n')
 
+    def _init_extensions(self):
+        """Initializes extensions."""
+
+        for ext in os.listdir('extensions'):
+            if ext.endswith('.py'):
+                try:
+                    bot.load_extension(f'extensions.{ext[:-3]}')
+                    self.extensions_list.append(
+                        f'extensions.{ext[:-3]}')
+                except Exception as e:
+                    print(e)
+
     async def _get_prefix_new(self, bot, msg):
         """More flexible check for prefix."""
 
@@ -68,7 +81,7 @@ class Bot(commands.Bot):
 
         # NOTE Extension Entry Point
         # Loads core, which loads all other extensions
-        self.load_extension('extensions.core')
+        self._init_extensions()
 
         # Logging
         msg = "CONNECTED!\n"