diff --git a/antipolls/antipolls.py b/antipolls/antipolls.py index 4014253..1f2b67c 100644 --- a/antipolls/antipolls.py +++ b/antipolls/antipolls.py @@ -101,8 +101,7 @@ class AntiPolls(commands.Cog): role_whitelist.append(role.id) await ctx.tick() if failed: - mention_list = (role.mention for role in failed) - await ctx.send(f"The following roles were already in the whitelist: {humanize_list(mention_list)}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) + await ctx.send(f"The following roles were already in the whitelist: {humanize_list([role for role in failed])}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) @antipolls_roles.command(name="remove") async def antipolls_roles_remove(self, ctx: commands.Context, *roles: discord.Role) -> None: @@ -117,8 +116,7 @@ class AntiPolls(commands.Cog): role_whitelist.remove(role.id) await ctx.tick() if failed: - mention_list = (role.mention for role in failed) - await ctx.send(f"The following roles were not in the whitelist: {humanize_list(mention_list)}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) + await ctx.send(f"The following roles were not in the whitelist: {humanize_list([role.mention for role in failed])}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) @antipolls_roles.command(name="list") async def antipolls_roles_list(self, ctx: commands.Context) -> None: @@ -127,7 +125,7 @@ class AntiPolls(commands.Cog): if not role_whitelist: return await ctx.send("No roles in the whitelist.") roles = [ctx.guild.get_role(role) for role in role_whitelist] - await ctx.send(humanize_list(role.mention for role in roles)) + await ctx.send(humanize_list([role.mention for role in roles])) @antipolls.group(name="channels") async def antipolls_channels(self, ctx: commands.Context) -> None: @@ -146,8 +144,7 @@ class AntiPolls(commands.Cog): channel_whitelist.append(channel.id) await ctx.tick() if failed: - mention_list = (role.mention for role in failed) - await ctx.send(f"The following channels were already in the whitelist: {humanize_list(mention_list)}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) + await ctx.send(f"The following channels were already in the whitelist: {humanize_list([channel.mention for channel in failed])}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) @antipolls_channels.command(name="remove") async def antipolls_channels_remove(self, ctx: commands.Context, *channels: discord.TextChannel) -> None: @@ -162,8 +159,7 @@ class AntiPolls(commands.Cog): channel_whitelist.remove(channel.id) await ctx.tick() if failed: - mention_list = (role.mention for role in failed) - await ctx.send(f"The following channels were not in the whitelist: {humanize_list(mention_list)}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) + await ctx.send(f"The following channels were not in the whitelist: {humanize_list([channel.mention for channel in failed])}", delete_after=10, allowed_mentions=discord.AllowedMentions.none) @antipolls_channels.command(name="list") async def antipolls_channels_list(self, ctx: commands.Context) -> None: @@ -172,7 +168,7 @@ class AntiPolls(commands.Cog): if not channel_whitelist: return await ctx.send("No channels in the whitelist.") channels = [ctx.guild.get_channel(channel) for channel in channel_whitelist] - await ctx.send(humanize_list(channel.mention for channel in channels)) + await ctx.send(humanize_list([channel.mention for channel in channels])) @antipolls.command(name="managemessages") async def antipolls_managemessages(self, ctx: commands.Context, enabled: bool) -> None: