diff --git a/exportchannels/exportchannels.py b/exportchannels/exportchannels.py index 4b10d5d..7c82150 100644 --- a/exportchannels/exportchannels.py +++ b/exportchannels/exportchannels.py @@ -13,6 +13,7 @@ class ExportChannels(commands.Cog): self.config.register_global( bot_token = None ) + self.data_path = data_manager.cog_data_path(self) class ConfigException(Exception): pass @@ -20,7 +21,7 @@ class ExportChannels(commands.Cog): async def export(self, channels: list): token = await self.config.bot_token() if token is None: - raise(self.ConfigException, "Bot token not set!") + raise(self.ConfigException("Bot token not set!")) data_path = data_manager.cog_data_path(self) bundled_data_path = data_manager.bundled_data_path(self) out = f'{data_path}{os.sep}Exported Channels' @@ -71,12 +72,12 @@ class ExportChannels(commands.Cog): @commands.group() @checks.is_owner() - async def exportset(self, ctx): + async def exportset(self, ctx: commands.Context): """Configuration options for the ExportChannels cog.""" @exportset.command() @checks.is_owner() - async def token(self, ctx, token: str): + async def token(self, ctx: commands.Context, token: str): """Sets the bot token used for Discord Chat Exporter.""" await self.config.bot_token.set({token}) await ctx.send(content="Token set!") @@ -84,21 +85,18 @@ class ExportChannels(commands.Cog): @exportset.command() @checks.is_owner() - async def checkoutputpath(self, ctx): + async def checkoutputpath(self, ctx: commands.Context): """Checks what file path DCE is outputting to.""" - self.data_path = data_manager.cog_data_path(self) await ctx.send(content=f"{self.data_path}") @commands.command() @commands.admin() - async def exportchannel(self, ctx, channel: discord.TextChannel): + async def exportchannel(self, ctx: commands.Context, channel: discord.TextChannel): """Exports a channel using Discord Chat Exporter.""" token = await self.config.bot_token() - dce_install = data_manager.bundled_data_path(self) if token is None: await ctx.send(content=f"Please set your token with the ``{ctx.prefix}exportset token`` command!") return - else: - id_list = [thread.id for thread in channel.threads] - id_list.insert(0, channel.id) - await self.export(id_list) + id_list = [thread.id for thread in channel.threads] + id_list.insert(0, channel.id) + await self.export(id_list)