Move functions to utils.manage_commands

Author: 4surix

discord_slash/client.py

@@ -167,45 +167,6 @@ async def register_all_commands(self):
                                                         selected.options)
         self.logger.info("Completed registering all commands!")
 
-    async def remove_all_commands(self):
-        """
-        Remove all slash commands.
-        """
-
-        await self.remove_all_commands_in('global')
-
-        for guild in self._discord.guilds:
-            try: await self.remove_all_commands_in(guild.id)
-            except error.RequestFailure:
-                pass
-
-    async def remove_all_commands_in(self, area):
-        """
-        Remove all slash commands in area.
-
-        :param area: 'global' or guild ID where removing all commands.
-        :type area: Union[str, int]
-        """
-        await self._discord.wait_until_ready()  # In case commands are still not registered to SlashCommand.
-
-        self.logger.info("Removing commands...")
-
-        commands = await manage_commands.get_all_commands(
-            self._discord.user.id,
-            self._discord.http.token,
-            None if area == 'global' else area
-        )
-
-        for command in commands:
-            await manage_commands.remove_slash_command(
-                self._discord.user.id,
-                self._discord.http.token,
-                None if area == 'global' else area,
-                command['id']
-            )
-
-        self.logger.info("Completed removing all commands !")
-
     def add_slash_command(self,
                           cmd,
                           name: str = None,

discord_slash/utils/manage_commands.py

@@ -93,6 +93,52 @@ async def get_all_commands(bot_id,
             return await resp.json()
 
 
+async def remove_all_commands(slash):
+    """
+    Remove all slash commands.
+
+    :param slash: Instance of SlashCommand.
+    :type slash: SlashCommand
+    """
+
+    await remove_all_commands_in(slash, 'global')
+
+    for guild in slash._discord.guilds:
+        try: await remove_all_commands_in(slash, guild.id)
+        except RequestFailure:
+            pass
+
+
+async def remove_all_commands_in(slash, area):
+    """
+    Remove all slash commands in area.
+
+    :param slash: Instance of SlashCommand.
+    :type slash: SlashCommand
+    :param area: 'global' or guild ID where removing all commands.
+    :type area: Union[str, int]
+    """
+    await slash._discord.wait_until_ready()  # In case commands are still not registered to SlashCommand.
+
+    slash.logger.info("Removing commands...")
+
+    commands = await get_all_commands(
+        slash._discord.user.id,
+        slash._discord.http.token,
+        None if area == 'global' else area
+    )
+
+    for command in commands:
+        await remove_slash_command(
+            slash._discord.user.id,
+            slash._discord.http.token,
+            None if area == 'global' else area,
+            command['id']
+        )
+
+    slash.logger.info("Completed removing all commands !")
+
+
 def create_option(name: str,
                   description: str,
                   option_type: int,