Merge pull request #50 from baneetparmar/v1s1t0r999/main

V1s1t0r999/main

cogs/admin/decisions.py

@@ -81,45 +81,7 @@ async def on_reaction(self, payload) -> None:
                             return
                     return
 
-    @commands.command(help="Creates a poll with up to 10 choices.")
-    async def poll(self, ctx, desc, *choices) -> None:
-        """
-        create a poll with up to 10 choices
-
-        :param ctx: discord context manager
-        :type ctx: discod.contextManager
-        :param desc: question/decision to conduct poll
-        :type desc: str
-        :param choices: available choices for the poll
-        :type choices: list[str]
-        """
-        await ctx.message.delete()
-
-        if len(choices) < 2:
-            ctx.command.reset_cooldown(ctx)
-            if len(choices) == 1:
-                return await ctx.send("Can't make a poll with only one choice")
-            return await ctx.send(
-                "You have to enter two or more choices to make a poll"
-            )
-
-        if len(choices) > 10:
-            ctx.command.reset_cooldown(ctx)
-            return await ctx.send("You can't make a poll with more than 10 choices")
-
-        embed = discord.Embed(
-            description=f"**{desc}**\n\n"
-            + "\n\n".join(
-                f"{str(self.reactions[i])}  {choice}"
-                for i, choice in enumerate(choices, 1)
-            ),
-            timestamp=datetime.datetime.utcnow(),
-            color=discord.colour.Color.red(),
-        )
-        embed.set_footer(text=f"Poll by {str(ctx.author)}")
-        msg = await ctx.send(embed=embed)
-        for i in range(1, len(choices) + 1):
-            await msg.add_reaction(self.reactions[i])
+#HISTORY: POLL CMD WAS HERE
 
     @commands.command(help="toss a coin")
     async def toss(self, ctx) -> None:

cogs/admin/poll.py

@@ -0,0 +1,118 @@
+from discord.ext import commands
+import asyncio
+import discord
+
+def to_emoji(c):
+    base = 0x1f1e6
+    return chr(base + c)
+
+class Polls(commands.Cog):
+    """Poll voting system."""
+
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.command()
+    @commands.guild_only()
+    async def poll(self, ctx, *, question):
+        """Interactively creates a poll with the following question.
+        To vote, use reactions!
+        """
+
+        # a list of messages to delete when we're all done
+        messages = [ctx.message]
+        answers = []
+
+        def check(m):
+            return m.author == ctx.author and m.channel == ctx.channel and len(m.content) <= 100
+
+        for i in range(20):
+            messages.append(await ctx.send(f'Say poll option or `publishify` (`pbf`) to publish poll.'))
+
+            try:
+                entry = await self.bot.wait_for('message', check=check, timeout=60.0)
+            except asyncio.TimeoutError:
+                break
+
+            messages.append(entry)
+
+            if entry.clean_content.startswith(f'publishify') or entry.clean_content.startswith(f'pbf'):
+                break
+
+            answers.append((to_emoji(i), entry.clean_content))
+
+        try:
+            await ctx.channel.delete_messages(messages)
+        except:
+            print('Failed to delete messages')
+
+        answer = '\n'.join(f'{keycap}: {content}' for keycap, content in answers)
+        actual_poll = await ctx.send(embed=discord.Embed(title=f'"{question.title()}"',description=f'{answer}',colour=discord.Colour.random()).set_author(name=f"A poll by {ctx.author.name}",icon_url=ctx.author.avatar_url))
+        await actual_poll.edit(embed=discord.Embed(title=f'"{question.title()}"',description=f'{answer}',colour=discord.Colour.random()).set_author(name=f"A poll by {ctx.author.name}",icon_url=ctx.author.avatar_url).set_footer(text=f"Poll ID: {actual_poll.id}"))
+        for emoji, _ in answers:
+            await actual_poll.add_reaction(emoji)
+
+
+    @commands.command(name='tally',help="Get the results of a poll!!")
+    async def tally(self, ctx, poll_id):
+        """Tally the created poll"""
+        pid=poll_id
+        poll_message = await ctx.message.channel.fetch_message(pid)
+        if not poll_message.embeds:
+            return await ctx.send("Wrong ID",delete_after=5)
+        embed = poll_message.embeds[0]
+        if poll_message.author != self.bot.user:
+            return await ctx.send("I didn't create that poll!!",delete_after=5)
+        if not embed.footer.text.startswith('Poll ID:'):
+            return await ctx.send("Wrong Poll ID",delete_after=5)
+        unformatted_options = [x.strip() for x in embed.description.split('\n')]
+        opt_dict = {x[:2]: x[3:] for x in unformatted_options} if unformatted_options[0][0] == '1' \
+            else {x[:1]: x[2:] for x in unformatted_options}
+        # check if we're using numbers for the poll, or x/checkmark, parse accordingly
+        voters = [self.bot.user.id]  # add the bot's ID to the list of voters to exclude it's votes
+
+        tally = {x: 0 for x in opt_dict.keys()}
+        for reaction in poll_message.reactions:
+            if reaction.emoji in opt_dict.keys():
+                reactors = await reaction.users().flatten()
+                for reactor in reactors:
+                    if reactor.id not in voters:
+                        tally[reaction.emoji] += 1
+                        voters.append(reactor.id)
+
+        output = 'Results of the poll for {}:\n'.format(embed.title) + \
+                '\n'.join(['{}: {}'.format(opt_dict[key], tally[key]) for key in tally.keys()])
+        await ctx.send(embed=discord.Embed(description=output))
+
+
+    @commands.command()
+    @commands.guild_only()
+    async def quickpoll(self, ctx, *questions_and_choices: str):
+        """Makes a poll quickly.
+        The first argument is the question and the rest are the choices.
+        """
+
+        if len(questions_and_choices) < 3:
+            return await ctx.send('Need at least 1 question with 2 choices.')
+        elif len(questions_and_choices) > 21:
+            return await ctx.send('You can only have up to 20 choices.')
+
+        perms = ctx.channel.permissions_for(ctx.me)
+        if not (perms.read_message_history or perms.add_reactions):
+            return await ctx.send('Need Read Message History and Add Reactions permissions.')
+
+        question = questions_and_choices[0]
+        choices = [(to_emoji(e), v) for e, v in enumerate(questions_and_choices[1:])]
+
+        try:
+            await ctx.message.delete()
+        except:
+            pass
+
+        body = "\n".join(f"{key}: {c}" for key, c in choices)
+        poll = await ctx.send(f'{ctx.author} asks: {question}\n\n{body}')
+        for emoji, _ in choices:
+            await poll.add_reaction(emoji)
+
+def setup(bot):
+    bot.add_cog(Polls(bot))