From 99898c9a14a30fad431ced6287876b6af553d338 Mon Sep 17 00:00:00 2001
From: Matthias Nadler <matthias.nadler@unibas.ch>
Date: Mon, 17 Jun 2019 23:29:27 +0200
Subject: [PATCH 1/4] working on 2.4 mention command started with debug command
 export for custom votes finished cmd

---
 cogs/help.py               |  44 +++-
 cogs/poll_controls.py      | 315 ++++++++++++++++++-----------
 essentials/multi_server.py |   4 +-
 models/__init__.py         |   0
 {cogs => models}/poll.py   | 400 +++++++++++++++++++++++++++++++------
 pollmaster.py              |   2 +-
 6 files changed, 581 insertions(+), 184 deletions(-)
 create mode 100644 models/__init__.py
 rename {cogs => models}/poll.py (75%)

diff --git a/cogs/help.py b/cogs/help.py
index 51664e9..4b25dad 100644
--- a/cogs/help.py
+++ b/cogs/help.py
@@ -51,7 +51,7 @@ class Help(commands.Cog):
         if page == '🏠':
             ## POLL CREATION SHORT
             embed.add_field(name='🆕 Making New Polls',
-                            value=f'`{pre}quick` | `{pre}new` | `{pre}prepare` | `{pre}cmd <args>`', inline=False)
+                            value=f'`{pre}quick` | `{pre}new` | `{pre}advanced` | `{pre}prepare` | `{pre}cmd <args>`', inline=False)
             # embed.add_field(name='Commands', value=f'`{pre}quick` | `{pre}new` | `{pre}prepared`', inline=False)
             # embed.add_field(name='Arguments', value=f'Arguments: `<poll question>` (optional)', inline=False)
             # embed.add_field(name='Examples', value=f'Examples: `{pre}new` | `{pre}quick What is the greenest color?`',
@@ -221,6 +221,48 @@ class Help(commands.Cog):
         # cleanup
         await ctx.message.delete()
 
+    @commands.Cog.listener()
+    async def on_message(self, message):
+        if message.content.startswith("@mention "):
+            channel = message.channel
+            if not isinstance(channel, discord.TextChannel):
+                await channel.send("@mention can only be used in a server text channel.")
+                return
+
+            guild = message.guild
+            if not guild:
+                await channel.send("Could not determine your server.")
+                return
+
+            tag = message.content.split()[1].lower()
+            if tag == "prefix":
+                pre = await get_server_pre(self.bot, guild)
+                # await channel.send(f'The prefix for this server/channel is: \n {pre} \n To change it type: \n'
+                #                    f'{pre}prefix <new_prefix>')
+                await channel.send(pre)
+
+        elif message.content == "@debug":
+            channel = message.channel
+            if not isinstance(channel, discord.TextChannel):
+                await channel.send("@debug can only be used in a server text channel.")
+                return
+
+            guild = message.guild
+            if not guild:
+                await channel.send("Could not determine your server.")
+                return
+
+            status_msg = ''
+
+            permissions = channel.permissions_for(guild.me)
+            if not permissions.send_messages:
+                await message.author.send(f'I don\'t have permission to send text messages in channel {channel} '
+                                          f'on server {guild}')
+                return
+
+            status_msg += f' ✅ Sending messages\n'
+
+            await channel.send(status_msg)
 
 def setup(bot):
     global logger
diff --git a/cogs/poll_controls.py b/cogs/poll_controls.py
index 4810682..3ce190a 100644
--- a/cogs/poll_controls.py
+++ b/cogs/poll_controls.py
@@ -11,26 +11,27 @@ import pytz
 from discord.ext import commands
 
 from utils.misc import CustomFormatter
-from .poll import Poll
+from models.poll import Poll
 from utils.paginator import embed_list_paginated
 from essentials.multi_server import get_server_pre, ask_for_server, ask_for_channel
 from essentials.settings import SETTINGS
 from utils.poll_name_generator import generate_word
 from essentials.exceptions import StopWizard
 
-## A-Z Emojis for Discord
+# A-Z Emojis for Discord
 AZ_EMOJIS = [(b'\\U0001f1a'.replace(b'a', bytes(hex(224 + (6 + i))[2:], "utf-8"))).decode("unicode-escape") for i in
              range(26)]
 
+
 class PollControls(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-        #self.bot.loop.create_task(self.close_polls())
+        self.bot.loop.create_task(self.close_polls())
         self.ignore_next_removed_reaction = {}
-    #
+
     # # General Methods
 
-    def get_label(self, message : discord.Message):
+    def get_label(self, message: discord.Message):
         label = None
         if message and message.embeds:
             embed = message.embeds[0]
@@ -45,6 +46,10 @@ class PollControls(commands.Cog):
         """This function runs every 60 seconds to schedule prepared polls and close expired polls"""
         while True:
             try:
+                if not hasattr(self.bot, 'db'):
+                    await asyncio.sleep(30)
+                    continue
+
                 query = self.bot.db.polls.find({'active': False, 'activation': {"$not": re.compile("0")}})
                 if query:
                     for pd in [poll async for poll in query]:
@@ -73,17 +78,17 @@ class PollControls(commands.Cog):
                             except:
                                 continue
             except AttributeError as ae:
-                #Database not loaded yet
+                # Database not loaded yet
                 logger.warning("Attribute Error in close_polls loop")
                 logger.exception(ae)
                 pass
             except Exception as ex:
-                #Never break this loop due to an error
+                # Never break this loop due to an error
                 logger.error("Other Error in close_polls loop")
                 logger.exception(ex)
                 pass
 
-            await asyncio.sleep(30)
+            await asyncio.sleep(60)
 
     def get_lock(self, server_id):
         if not self.bot.locks.get(server_id):
@@ -119,7 +124,7 @@ class PollControls(commands.Cog):
             embed.set_footer(text=footer_text)
         await ctx.send(embed=embed)
 
-    # # Commands
+    # Commands
     @commands.command()
     async def activate(self, ctx, *, short=None):
         """Activate a prepared poll. Parameter: <label>"""
@@ -229,6 +234,31 @@ class PollControls(commands.Cog):
                 await self.say_error(ctx, error)
                 await ctx.invoke(self.show)
 
+    @commands.command()
+    async def copy(self, ctx, *, short=None):
+        '''Copy a poll. Parameter: <label>'''
+        server = await ask_for_server(self.bot, ctx.message, short)
+        if not server:
+            return
+
+        if short is None:
+            pre = await get_server_pre(self.bot, ctx.message.guild)
+            error = f'Please specify the label of a poll after the copy command. \n' \
+                    f'`{pre}copy <poll_label>`'
+            await self.say_error(ctx, error)
+
+        else:
+            p = await Poll.load_from_db(self.bot, server.id, short)
+            if p is not None:
+                text = await get_server_pre(self.bot, server) + p.to_command()
+                await self.say_embed(ctx, text, title="Paste this to create a copy of the poll")
+            else:
+                error = f'Poll with label "{short}" was not found. Listing all open polls.'
+                # pre = await get_server_pre(self.bot, ctx.message.server)
+                # footer = f'Type {pre}show to display all polls'
+                await self.say_error(ctx, error)
+                await ctx.invoke(self.show)
+
     @commands.command()
     async def export(self, ctx, *, short=None):
         '''Export a poll. Parameter: <label>'''
@@ -317,87 +347,96 @@ class PollControls(commands.Cog):
                 pre = await get_server_pre(self.bot, server)
                 footer = f'Type {pre}show to display all polls'
                 await self.say_error(ctx, error, footer)
-    #
-    # @commands.command()
-    # async def cmd(self, ctx, *, cmd=None):
-    #     '''The old, command style way paired with the wizard.'''
-    #     await self.say_embed(ctx, say_text='This command is temporarily disabled.')
-    #     # server = await ask_for_server(self.bot, ctx.message)
-    #     # if not server:
-    #     #     return
-    #     # pre = await get_server_pre(self.bot, server)
-    #     # try:
-    #     #     # generate the argparser and handle invalid stuff
-    #     #     descr = 'Accept poll settings via commandstring. \n\n' \
-    #     #             '**Wrap all arguments in quotes like this:** \n' \
-    #     #             f'{pre}cmd -question \"What tea do you like?\" -o \"green, black, chai\"\n\n' \
-    #     #             'The Order of arguments doesn\'t matter. If an argument is missing, it will use the default value. ' \
-    #     #             'If an argument is invalid, the wizard will step in. ' \
-    #     #             'If the command string is invalid, you will get this error :)'
-    #     #     parser = argparse.ArgumentParser(description=descr, formatter_class=CustomFormatter, add_help=False)
-    #     #     parser.add_argument('-question', '-q')
-    #     #     parser.add_argument('-label', '-l', default=str(await generate_word(self.bot, server.id)))
-    #     #     parser.add_argument('-options', '-o')
-    #     #     parser.add_argument('-multiple_choice', '-mc', default='1')
-    #     #     parser.add_argument('-roles', '-r', default='all')
-    #     #     parser.add_argument('-weights', '-w', default='none')
-    #     #     parser.add_argument('-deadline', '-d', default='0')
-    #     #     parser.add_argument('-anonymous', '-a', action="store_true")
-    #     #
-    #     #     helpstring = parser.format_help()
-    #     #     helpstring = helpstring.replace("pollmaster.py", f"{pre}cmd ")
-    #     #
-    #     #     if cmd and cmd == 'help':
-    #     #         await self.say_embed(ctx, say_text=helpstring)
-    #     #         return
-    #     #
-    #     #     try:
-    #     #         cmds = shlex.split(cmd)
-    #     #     except ValueError:
-    #     #         await self.say_error(ctx, error_text=helpstring)
-    #     #         return
-    #     #     except:
-    #     #         return
-    #     #
-    #     #     try:
-    #     #         args, unknown_args = parser.parse_known_args(cmds)
-    #     #     except SystemExit:
-    #     #         await self.say_error(ctx, error_text=helpstring)
-    #     #         return
-    #     #     except:
-    #     #         return
-    #     #
-    #     #     if unknown_args:
-    #     #         error_text = f'**There was an error reading the command line options!**.\n' \
-    #     #                      f'Most likely this is because you didn\'t surround the arguments with double quotes like this: ' \
-    #     #                      f'`{pre}cmd -q "question of the poll" -o "yes, no, maybe"`' \
-    #     #                      f'\n\nHere are the arguments I could not understand:\n'
-    #     #         error_text += '`'+'\n'.join(unknown_args)+'`'
-    #     #         error_text += f'\n\nHere are the arguments which are ok:\n'
-    #     #         error_text += '`' + '\n'.join([f'{k}: {v}' for k, v in vars(args).items()]) + '`'
-    #     #
-    #     #         await self.say_error(ctx, error_text=error_text, footer_text=f'type `{pre}cmd help` for details.')
-    #     #         return
-    #     #
-    #     #     # pass arguments to the wizard
-    #     #     async def route(poll):
-    #     #         await poll.set_name(force=args.question)
-    #     #         await poll.set_short(force=args.label)
-    #     #         await poll.set_anonymous(force=f'{"yes" if args.anonymous else "no"}')
-    #     #         await poll.set_options_reaction(force=args.options)
-    #     #         await poll.set_multiple_choice(force=args.multiple_choice)
-    #     #         await poll.set_roles(force=args.roles)
-    #     #         await poll.set_weights(force=args.weights)
-    #     #         await poll.set_duration(force=args.deadline)
-    #     #
-    #     #     poll = await self.wizard(ctx, route, server)
-    #     #     if poll:
-    #     #         await poll.post_embed(destination=poll.channel)
-    #     # except Exception as error:
-    #     #     logger.error("ERROR IN pm!cmd")
-    #     #     logger.exception(error)
-    #
-    #
+
+    @commands.command()
+    async def cmd(self, ctx, *, cmd=None):
+        '''The old, command style way paired with the wizard.'''
+        # await self.say_embed(ctx, say_text='This command is temporarily disabled.')
+
+        server = await ask_for_server(self.bot, ctx.message)
+        if not server:
+            return
+        pre = await get_server_pre(self.bot, server)
+        try:
+            # generate the argparser and handle invalid stuff
+            descr = 'Accept poll settings via commandstring. \n\n' \
+                    '**Wrap all arguments in quotes like this:** \n' \
+                    f'{pre}cmd -question \"What tea do you like?\" -o \"green, black, chai\"\n\n' \
+                    'The Order of arguments doesn\'t matter. If an argument is missing, it will use the default value. ' \
+                    'If an argument is invalid, the wizard will step in. ' \
+                    'If the command string is invalid, you will get this error :)'
+            parser = argparse.ArgumentParser(description=descr, formatter_class=CustomFormatter, add_help=False)
+            parser.add_argument('-question', '-q')
+            parser.add_argument('-label', '-l', default=str(await generate_word(self.bot, server.id)))
+            parser.add_argument('-anonymous', '-a', action="store_true")
+            parser.add_argument('-options', '-o')
+            parser.add_argument('-survey_flags', '-sf', default='0')
+            parser.add_argument('-multiple_choice', '-mc', default='1')
+            parser.add_argument('-hide_votes', '-h', action="store_true")
+            parser.add_argument('-roles', '-r', default='all')
+            parser.add_argument('-weights', '-w', default='none')
+            parser.add_argument('-prepare', '-p', default='-1')
+            parser.add_argument('-deadline', '-d', default='0')
+
+            helpstring = parser.format_help()
+            helpstring = helpstring.replace("pollmaster.py", f"{pre}cmd ")
+
+            if not cmd or len(cmd) < 2 or cmd == 'help':
+                # Shlex will block if the string is empty
+                await self.say_embed(ctx, say_text=helpstring)
+                return
+
+            try:
+                cmds = shlex.split(cmd)
+            except ValueError:
+                await self.say_error(ctx, error_text=helpstring)
+                return
+            except:
+                return
+
+            try:
+                args, unknown_args = parser.parse_known_args(cmds)
+            except SystemExit:
+                await self.say_error(ctx, error_text=helpstring)
+                return
+            except:
+                return
+
+            if unknown_args:
+                error_text = f'**There was an error reading the command line options!**.\n' \
+                             f'Most likely this is because you didn\'t surround the arguments with double quotes like this: ' \
+                             f'`{pre}cmd -q "question of the poll" -o "yes, no, maybe"`' \
+                             f'\n\nHere are the arguments I could not understand:\n'
+                error_text += '`'+'\n'.join(unknown_args)+'`'
+                error_text += f'\n\nHere are the arguments which are ok:\n'
+                error_text += '`' + '\n'.join([f'{k}: {v}' for k, v in vars(args).items()]) + '`'
+
+                await self.say_error(ctx, error_text=error_text, footer_text=f'type `{pre}cmd help` for details.')
+                return
+
+            # pass arguments to the wizard
+            async def route(poll):
+                await poll.set_name(ctx, force=args.question)
+                await poll.set_short(ctx, force=args.label)
+                await poll.set_anonymous(ctx, force=f'{"yes" if args.anonymous else "no"}')
+                await poll.set_options_reaction(ctx, force=args.options)
+                await poll.set_survey_flags(ctx, force=args.survey_flags)
+                await poll.set_multiple_choice(ctx, force=args.multiple_choice)
+                await poll.set_hide_vote_count(ctx, force=f'{"yes" if args.hide_votes else "no"}')
+                await poll.set_roles(ctx, force=args.roles)
+                await poll.set_weights(ctx, force=args.weights)
+                await poll.set_preparation(ctx, force=args.prepare)
+                await poll.set_duration(ctx, force=args.deadline)
+
+            poll = await self.wizard(ctx, route, server)
+            if poll:
+                await poll.post_embed(poll.channel)
+
+        except Exception as error:
+            logger.error("ERROR IN pm!cmd")
+            logger.exception(error)
+
+
     @commands.command()
     async def quick(self, ctx, *, cmd=None):
         '''Create a quick poll with just a question and some options. Parameters: <Question> (optional)'''
@@ -411,6 +450,7 @@ class PollControls(commands.Cog):
             await poll.set_anonymous(ctx, force='no')
             await poll.set_options_reaction(ctx)
             await poll.set_multiple_choice(ctx, force='1')
+            await poll.set_hide_vote_count(ctx, force='no')
             await poll.set_roles(ctx, force='all')
             await poll.set_weights(ctx, force='none')
             await poll.set_duration(ctx, force='0')
@@ -432,7 +472,9 @@ class PollControls(commands.Cog):
             await poll.set_preparation(ctx)
             await poll.set_anonymous(ctx)
             await poll.set_options_reaction(ctx)
+            await poll.set_survey_flags(ctx)
             await poll.set_multiple_choice(ctx)
+            await poll.set_hide_vote_count(ctx)
             await poll.set_roles(ctx)
             await poll.set_weights(ctx)
             await poll.set_duration(ctx)
@@ -441,6 +483,29 @@ class PollControls(commands.Cog):
         if poll:
             await poll.post_embed(ctx.message.author)
 
+    @commands.command()
+    async def advanced(self, ctx, *, cmd=None):
+        """Poll with more options. Parameters: <Question> (optional)"""
+        server = await ask_for_server(self.bot, ctx.message)
+        if not server:
+            return
+
+        async def route(poll):
+            await poll.set_name(ctx, force=cmd)
+            await poll.set_short(ctx)
+            await poll.set_anonymous(ctx)
+            await poll.set_options_reaction(ctx)
+            await poll.set_survey_flags(ctx)
+            await poll.set_multiple_choice(ctx)
+            await poll.set_hide_vote_count(ctx)
+            await poll.set_roles(ctx)
+            await poll.set_weights(ctx)
+            await poll.set_duration(ctx)
+
+        poll = await self.wizard(ctx, route, server)
+        if poll:
+            await poll.post_embed(poll.channel)
+
     @commands.command()
     async def new(self, ctx, *, cmd=None):
         """Start the poll wizard to create a new poll step by step. Parameters: <Question> (optional)"""
@@ -454,8 +519,9 @@ class PollControls(commands.Cog):
             await poll.set_anonymous(ctx)
             await poll.set_options_reaction(ctx)
             await poll.set_multiple_choice(ctx)
-            await poll.set_roles(ctx)
-            await poll.set_weights(ctx)
+            await poll.set_hide_vote_count(ctx, force='no')
+            await poll.set_roles(ctx, force='all')
+            await poll.set_weights(ctx, force='none')
             await poll.set_duration(ctx)
 
         poll = await self.wizard(ctx, route, server)
@@ -468,13 +534,14 @@ class PollControls(commands.Cog):
         if not channel:
             return
 
+        pre = await get_server_pre(self.bot, server)
+
         # Permission Check
         member = server.get_member(ctx.message.author.id)
         if not member.guild_permissions.manage_guild:
             result = await self.bot.db.config.find_one({'_id': str(server.id)})
             if result and result.get('admin_role') not in [r.name for r in member.roles] and result.get(
                     'user_role') not in [r.name for r in member.roles]:
-                pre = await get_server_pre(self.bot, server)
                 await ctx.message.author.send('You don\'t have sufficient rights to start new polls on this server. '
                                             'A server administrator has to assign the user or admin role to you. '
                                             f'To view and set the permissions, an admin can use `{pre}userrole` and '
@@ -485,35 +552,20 @@ class PollControls(commands.Cog):
         poll = Poll(self.bot, ctx, server, channel)
 
         ## Route to define object, passed as argument for different constructors
+        if ctx.message and ctx.message.content and not ctx.message.content.startswith(f'{pre}cmd '):
+            poll.wizard_messages.append(ctx.message)
         try:
             await route(poll)
             poll.finalize()
+            await poll.clean_up(ctx.channel)
         except StopWizard:
+            await poll.clean_up(ctx.channel)
             return
 
         # Finalize
         await poll.save_to_db()
         return poll
 
-    # # BOT EVENTS (@bot.event)
-    # async def on_socket_raw_receive(self, raw_msg):
-    #     print(raw_msg)
-    #     if not isinstance(raw_msg, str):
-    #         return
-    #     msg = json.loads(raw_msg)
-    #     type = msg.get("t")
-    #     data = msg.get("d")
-    #     if not data:
-    #         return
-    #     # emoji = data.get("emoji")
-    #     # user_id = data.get("user_id")
-    #     # message_id = data.get("message_id")
-    #     if type == "MESSAGE_REACTION_ADD":
-    #         await self.do_on_reaction_add(data)
-    #     elif type == "MESSAGE_REACTION_REMOVE":
-    #         #await self.do_on_reaction_remove(data)
-    #         pass
-
     @commands.Cog.listener()
     async def on_raw_reaction_remove(self, data):
         # get emoji symbol
@@ -672,6 +724,10 @@ class PollControls(commands.Cog):
                                       description='', color=SETTINGS.color)
                 embed.set_author(name=f" >> {p.short}", icon_url=SETTINGS.author_icon)
 
+                # created by
+                created_by = server.get_member(int(p.author.id))
+                embed.add_field(name=f'Created by:', value=f'{created_by if created_by else "<Deleted User>"}', inline=False)
+
                 # vote rights
                 vote_rights = await p.has_required_role(member)
                 embed.add_field(name=f'{"Can you vote?" if is_open else "Could you vote?"}',
@@ -679,7 +735,7 @@ class PollControls(commands.Cog):
 
                 # edit rights
                 edit_rights = False
-                if str(member.id) == str(p.author):
+                if str(member.id) == str(p.author.id):
                     edit_rights = True
                 elif member.guild_permissions.manage_guild:
                     edit_rights = True
@@ -724,7 +780,7 @@ class PollControls(commands.Cog):
                 await user.send(embed=embed)
 
                 # send current details of who currently voted for what
-                if not p.anonymous and p.votes.__len__() > 0:
+                if (not p.open or not p.hide_count) and not p.anonymous and p.votes.__len__() > 0:
                     msg = '--------------------------------------------\n' \
                               'CURRENT VOTES\n' \
                               '--------------------------------------------\n'
@@ -734,17 +790,21 @@ class PollControls(commands.Cog):
                         msg += "**" +o+":**"
                         c = 0
                         for user_id in p.votes:
-                            member = server.get_member(user_id)
+                            member = server.get_member(int(user_id))
                             if not member or i not in p.votes[str(user_id)]['choices']:
                                 continue
                             c += 1
                             name = member.nick
                             if not name:
                                 name = member.name
+                            if not name:
+                                name = "<Deleted User>"
                             msg += f'\n{name}'
                             if p.votes[str(user_id)]['weight'] != 1:
                                 msg += f' (weight: {p.votes[str(user_id)]["weight"]})'
                             # msg += ': ' + ', '.join([AZ_EMOJIS[c]+" "+p.options_reaction[c] for c in p.votes[user_id]['choices']])
+                            if i in p.survey_flags:
+                                msg += f': {p.votes[str(user_id)]["answers"][p.survey_flags.index(i)]}'
                             if msg.__len__() > 1500:
                                 await user.send(msg)
                                 msg = ''
@@ -754,6 +814,29 @@ class PollControls(commands.Cog):
 
                     if msg.__len__() > 0:
                         await user.send(msg)
+                elif (not p.open or not p.hide_count) and p.anonymous and p.survey_flags.__len__() > 0 and p.votes.__len__() > 0:
+                    msg = '--------------------------------------------\n' \
+                          'Custom Answers (Anonymous)\n' \
+                          '--------------------------------------------\n'
+                    has_answers = False
+                    for i, o in enumerate(p.options_reaction):
+                        if i not in p.survey_flags:
+                            continue
+                        custom_answers = ''
+                        for user_id in p.votes:
+                            if i in p.votes[str(user_id)]["choices"]:
+                                has_answers = True
+                                custom_answers += f'\n{p.votes[str(user_id)]["answers"][p.survey_flags.index(i)]}'
+                        if custom_answers.__len__() > 0:
+                            msg += AZ_EMOJIS[i] + " "
+                            msg += "**" + o + ":**"
+                            msg += custom_answers
+                            msg += '\n\n'
+                        if msg.__len__() > 1500:
+                            await user.send(msg)
+                            msg = ''
+                    if has_answers and msg.__len__() > 0:
+                        await user.send(msg)
                 return
 
             # Assume: User wants to vote with reaction
@@ -770,7 +853,6 @@ class PollControls(commands.Cog):
                 self.ignore_next_removed_reaction[str(message.id) + str(emoji)] = user_id
                 asyncio.ensure_future(message.remove_reaction(emoji, user))
 
-
             # order here is crucial since we can't determine if a reaction was removed by the bot or user
             # update database with vote
             await p.vote(member, emoji, message, lock)
@@ -785,6 +867,7 @@ class PollControls(commands.Cog):
             #             await message.remove_reaction(r.emoji, user)
             #     pass
 
+
 def setup(bot):
     global logger
     logger = logging.getLogger('bot')
diff --git a/essentials/multi_server.py b/essentials/multi_server.py
index c854b55..1993343 100644
--- a/essentials/multi_server.py
+++ b/essentials/multi_server.py
@@ -21,7 +21,7 @@ async def get_pre(bot, message):
 
 
 async def get_server_pre(bot, server):
-    '''Gets the prefix for a server.'''
+    """Gets the prefix for a server."""
     try:
         #result = await bot.db.config.find_one({'_id': str(server.id)})
         result = bot.pre[str(server.id)]
@@ -33,7 +33,7 @@ async def get_server_pre(bot, server):
 
 
 async def get_servers(bot, message, short=None):
-    '''Get best guess of relevant shared servers'''
+    """Get best guess of relevant shared servers"""
     if message.guild is None:
         list_of_shared_servers = []
         for s in bot.guilds:
diff --git a/models/__init__.py b/models/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/cogs/poll.py b/models/poll.py
similarity index 75%
rename from cogs/poll.py
rename to models/poll.py
index 7893a26..4f0132a 100644
--- a/cogs/poll.py
+++ b/models/poll.py
@@ -3,7 +3,8 @@ import codecs
 import datetime
 import logging
 import os
-import re
+import random
+
 import dateparser
 import pytz
 import regex
@@ -23,13 +24,13 @@ from utils.misc import possible_timezones
 
 logger = logging.getLogger('bot')
 
-## Helvetica is the closest font to Whitney (discord uses Whitney) in afm
-## This is used to estimate text width and adjust the layout of the embeds
+# Helvetica is the closest font to Whitney (discord uses Whitney) in afm
+# This is used to estimate text width and adjust the layout of the embeds
 afm_fname = os.path.join(rcParams['datapath'], 'fonts', 'afm', 'phvr8a.afm')
 with open(afm_fname, 'rb') as fh:
     afm = AFM(fh)
 
-## A-Z Emojis for Discord
+# A-Z Emojis for Discord
 AZ_EMOJIS = [(b'\\U0001f1a'.replace(b'a', bytes(hex(224 + (6 + i))[2:], "utf-8"))).decode("unicode-escape") for i in
              range(26)]
 
@@ -57,10 +58,12 @@ class Poll:
             self.name = "Quick Poll"
             self.short = str(uuid4())[0:23]
             self.anonymous = False
+            self.hide_count = False
             self.reaction = True
             self.multiple_choice = 1
             self.options_reaction = ['yes', 'no']
             self.options_reaction_default = False
+            self.survey_flags = []
             # self.options_traditional = []
             # self.options_traditional_default = False
             self.roles = ['@everyone']
@@ -76,6 +79,18 @@ class Poll:
             self.activation_tz = 0.0
             self.votes = {}
 
+            self.wizard_messages = []
+
+    def get_preset_options(self, number):
+        if number == 1:
+            return ['✅', '❎']
+        elif number == 2:
+            return ['👍', '🤐', '👎']
+        elif number == 3:
+            return ['😍', '👍', '🤐', '👎', '🤢']
+        elif number == 4:
+            return ['in favour', 'against', 'abstaining']
+
     async def is_open(self, update_db=True):
         if self.server is None:
             self.open = True
@@ -102,7 +117,9 @@ class Poll:
         embed = discord.Embed(title="Poll creation Wizard", description=text, color=SETTINGS.color)
         if footer:
             embed.set_footer(text="Type `stop` to cancel the wizard.")
-        return await ctx.send(embed=embed)
+        msg = await ctx.send(embed=embed)
+        self.wizard_messages.append(msg)
+        return msg
 
     async def wizard_says_edit(self, message, text, add=False):
         if add and message.embeds.__len__() > 0:
@@ -127,9 +144,13 @@ class Poll:
         """Pre-parse user input for wizard"""
         def check(m):
             return m.author == self.author
+        try:
+            reply = await self.bot.wait_for('message', timeout=180, check=check)
+        except asyncio.TimeoutError:
+            raise StopWizard
 
-        reply = await self.bot.wait_for('message', check=check)
         if reply and reply.content:
+            self.wizard_messages.append(reply)
             if reply.content.startswith(await get_pre(self.bot, reply)):
                 await self.wizard_says(ctx, f'You can\'t use bot commands during the Poll Creation Wizard.\n'
                                        f'Stopping the Wizard and then executing the command:\n`{reply.content}`',
@@ -144,7 +165,8 @@ class Poll:
         else:
             raise InvalidInput
 
-    def sanitize_string(self, string):
+    @staticmethod
+    def sanitize_string(string):
         """Sanitize user input for wizard"""
         # sanitize input
         if string is None:
@@ -239,7 +261,6 @@ class Poll:
                 await self.add_error(message,
                                      f'**The label `{reply}` is not unique on this server. Choose a different one!**')
 
-
     async def set_preparation(self, ctx, force=None):
         """Set the preparation conditions for the Poll."""
         async def get_valid(in_reply):
@@ -269,6 +290,9 @@ class Poll:
                 raise DateOutOfRange(dt)
             return dt
 
+        if str(force) == '-1':
+            return
+
         try:
             dt = await get_valid(force)
             self.activation = dt
@@ -302,7 +326,7 @@ class Poll:
                 self.active = False
                 break
             except InvalidInput:
-                await self.add_error(message, '**I could not understand that format.**')
+                await self.add_error(message, '**Specify the activation time in a format i can understand.**')
             except TypeError:
                 await self.add_error(message, '**Type Error.**')
             except DateOutOfRange as e:
@@ -404,7 +428,6 @@ class Poll:
             except OutOfRange:
                 await self.add_error(message, '**You can\'t have more choices than options.**')
 
-
     async def set_options_reaction(self, ctx, force=None):
         """Set the answers / options of the Poll."""
         async def get_valid(in_reply):
@@ -418,7 +441,7 @@ class Poll:
                     return int(split[0])
                 else:
                     raise WrongNumberOfArguments
-            elif 1 < split.__len__() <= 26:
+            elif 1 < split.__len__() <= 18:
                 split = [self.sanitize_string(o) for o in split]
                 if any([len(o) < 1 for o in split]):
                     raise InvalidInput
@@ -427,22 +450,11 @@ class Poll:
             else:
                 raise WrongNumberOfArguments
 
-        def get_preset_options(number):
-            if number == 1:
-                return ['✅', '❎']
-            elif number == 2:
-                return ['👍', '🤐', '👎']
-            elif number == 3:
-                return ['😍', '👍', '🤐', '👎', '🤢']
-            elif number == 4:
-                return ['in favour', 'against', 'abstaining']
-
-
         try:
             options = await get_valid(force)
             self.options_reaction_default = False
             if isinstance(options, int):
-                self.options_reaction = get_preset_options(options)
+                self.options_reaction = self.get_preset_options(options)
                 if options <= 3:
                     self.options_reaction_default = True
             else:
@@ -473,7 +485,7 @@ class Poll:
                 options = await get_valid(reply)
                 self.options_reaction_default = False
                 if isinstance(options, int):
-                    self.options_reaction = get_preset_options(options)
+                    self.options_reaction = self.get_preset_options(options)
                     if options <= 3:
                         self.options_reaction_default = True
                 else:
@@ -483,11 +495,115 @@ class Poll:
             except InvalidInput:
                 await self.add_error(message,
                                      '**Invalid entry. Type `1`, `2`, `3` or `4` or a comma separated list of '
-                                     'up to 26 options.**')
+                                     'up to 18 options.**')
             except WrongNumberOfArguments:
                 await self.add_error(message,
-                                     '**You need more than 1 option! Type them in a comma separated list.**')
+                                     '**You need more than 1 and less than 19 options! '
+                                     'Type them in a comma separated list.**')
 
+    async def set_survey_flags(self, ctx, force=None):
+        """Decide which Options will ask for user input."""
+        async def get_valid(in_reply):
+            if not in_reply:
+                raise InvalidInput
+            split = [r.strip() for r in in_reply.split(",")]
+
+            if not split or split.__len__() == 1 and split[0] == '0':
+                return []
+
+            if not all([r.isdigit() for r in split]):
+                raise ExpectedInteger
+
+            if any([1 > int(r) or int(r) > len(self.options_reaction) for r in split]):
+                raise OutOfRange
+
+            return [int(r)-1 for r in split]
+
+        if self.options_reaction_default:
+            return
+
+        try:
+            self.survey_flags = await get_valid(force)
+            return
+        except InputError:
+            pass
+
+        text = ("**Which options should ask the user for a custom answer?**\n"
+                "Type `0` to skip survey options.\n"
+                "If you want multiple survey options, separate the numbers with a comma.\n"
+                "\n"
+                "`0 - None (classic poll)`\n"
+                )
+        for i, option in enumerate(self.options_reaction):
+            text += f'`{i + 1} - {option}`\n'
+        text += ("\n"
+                 "If the user votes for one of these options, the bot will PM them and ask them to provide a text "
+                 "input. You can use this to do surveys or to gather feedback for example.\n")
+        message = await self.wizard_says(ctx, text)
+
+        while True:
+            try:
+                if force:
+                    reply = force
+                    force = None
+                else:
+                    reply = await self.get_user_reply(ctx)
+                self.survey_flags = await get_valid(reply)
+                await self.add_vaild(
+                    message, f'{"None" if self.survey_flags.__len__() == 0 else ", ".join(str(f + 1) for f in self.survey_flags)}'
+                )
+                break
+            except InvalidInput:
+                await self.add_error(message, '**I can\'t read this input.**')
+            except ExpectedInteger:
+                await self.add_error(message, '**Only type positive numbers separated by a comma.**')
+            except OutOfRange:
+                await self.add_error(message, '**Only type numbers you can see in the list.**')
+
+    async def set_hide_vote_count(self, ctx, force=None):
+        """Determine the live vote count is hidden or shown."""
+        async def get_valid(in_reply):
+            if not in_reply:
+                raise InvalidInput
+            is_true = ['yes', '1']
+            is_false = ['no', '0']
+            in_reply = self.sanitize_string(in_reply)
+            if not in_reply:
+                raise InvalidInput
+            elif in_reply.lower() in is_true:
+                return True
+            elif in_reply.lower() in is_false:
+                return False
+            else:
+                raise InvalidInput
+
+        try:
+            self.hide_count = await get_valid(force)
+            return
+        except InputError:
+            pass
+
+        text = ("**Do you want to hide the live vote count?**\n"
+                "\n"
+                "`0 - No, show it (Default)`\n"
+                "`1  - Yes, hide it`\n"
+                "\n"
+                "You will still be able to see the vote count once the poll is closed. This settings will just hide "
+                "the vote count while the poll is active.")
+        message = await self.wizard_says(ctx, text)
+
+        while True:
+            try:
+                if force:
+                    reply = force
+                    force = None
+                else:
+                    reply = await self.get_user_reply(ctx)
+                self.hide_count = await get_valid(reply)
+                await self.add_vaild(message, f'{"Yes" if self.hide_count else "No"}')
+                break
+            except InvalidInput:
+                await self.add_error(message, '**You can only answer with `yes` | `1` or `no` | `0`!**')
 
     async def set_roles(self, ctx, force=None):
         """Set role restrictions for the Poll."""
@@ -500,7 +616,7 @@ class Poll:
             if split.__len__() == 1 and split[0] in ['0', 'all', 'everyone']:
                 return ['@everyone']
 
-            if n_roles <= 20 and force is None:
+            if n_roles <= 20 and not force:
                 if not all([r.isdigit() for r in split]):
                     raise ExpectedInteger
                 elif any([int(r) > n_roles for r in split]):
@@ -614,6 +730,7 @@ class Poll:
                     force = None
                 else:
                     reply = await self.get_user_reply(ctx)
+                print(reply)
                 w_n = await get_valid(reply, self.server.roles)
                 self.weights_roles = w_n[0]
                 self.weights_numbers = w_n[1]
@@ -690,7 +807,7 @@ class Poll:
                     await self.add_vaild(message, self.duration.strftime('%d-%b-%Y %H:%M %Z'))
                 break
             except InvalidInput:
-                await self.add_error(message, '**I could not understand that format.**')
+                await self.add_error(message, '**Specify the deadline in a format I can understand.**')
             except TypeError:
                 await self.add_error(message, '**Type Error.**')
             except DateOutOfRange as e:
@@ -699,6 +816,83 @@ class Poll:
     def finalize(self):
         self.time_created = datetime.datetime.utcnow().replace(tzinfo=pytz.utc)
 
+    async def clean_up(self, channel):
+        if isinstance(channel, discord.TextChannel):
+            await channel.delete_messages(self.wizard_messages)
+
+    async def ask_for_input_DM(self, user, title, text):
+        embed = discord.Embed(title=title, description=text, color=SETTINGS.color)
+        embed.set_footer(text='You can answer anywhere.')
+        message = await user.send(embed=embed)
+
+        def check(m):
+            return m.author == user
+
+        try:
+            reply = await self.bot.wait_for('message', timeout=15, check=check)
+            if reply and reply.content:
+                reply = reply.content
+            else:
+                return None
+        except asyncio.TimeoutError:
+            if message.embeds.__len__() > 0:
+                embed.description = embed.description + '\n\n:exclamation: Request timed out. Vote was counted, ' \
+                                                        'but no custom answer recorded.'
+                await message.edit(embed=embed)
+            return None
+
+        try:
+            reply = self.sanitize_string(reply)
+        except InvalidInput:
+            embed = discord.Embed(title=title,
+                                  description="Invalid Input. To try again, un-vote and re-vote the option.",
+                                  color=SETTINGS.color
+                                  )
+            await user.send(embed=embed)
+
+        if message.embeds.__len__() > 0:
+            embed.description = embed.description + '\n\n✅ ' + reply
+            await message.edit(embed=embed)
+
+        return reply
+
+    def to_command(self):
+        # make new label by increasing a counter at the end
+        try:
+            new_nr = int(self.short[-1]) + 1
+            new_label = self.short[:-1] + str(new_nr)
+        except ValueError:
+            new_label = self.short + "2"
+
+        cmd = "cmd"
+
+        cmd += " -q \"" + self.name + "\""
+        cmd += " -l \"" + new_label + "\""
+        if self.anonymous:
+            cmd += " -a"
+
+        if self.options_reaction_default:
+            for i in range(1, 5):
+                if self.get_preset_options(i) == self.options_reaction:
+                    cmd += " -o \"" + str(i) + "\""
+        else:
+            cmd += " -o \"" + ", ".join(self.options_reaction) + "\""
+
+        cmd += " -sf \"" + ", ".join([str(x+1) for x in self.survey_flags]) + "\""
+        cmd += " -mc \"" + str(self.multiple_choice) + "\""
+        if self.hide_count:
+            cmd += " -h"
+        if self.roles != ["@everyone"]:
+            cmd += " -r \"" + ", ".join(self.roles) + "\""
+        if not self.active:
+            cmd += " -p \"specify activation time\""
+        if self.duration == 0:
+            cmd += " -d \"0\""
+        else:
+            cmd += " -d \"specify deadline\""
+
+        return cmd
+
     async def to_dict(self):
         if self.channel is None:
             cid = 0
@@ -715,11 +909,13 @@ class Poll:
             'name': self.name,
             'short': self.short,
             'anonymous': self.anonymous,
+            'hide_count': self.hide_count,
             'reaction': self.reaction,
             'multiple_choice': self.multiple_choice,
             'options_reaction': self.options_reaction,
             'reaction_default': self.options_reaction_default,
             #'options_traditional': self.options_traditional,
+            'survey_flags': self.survey_flags,
             'roles': self.roles,
             'weights_roles': self.weights_roles,
             'weights_numbers': self.weights_numbers,
@@ -766,7 +962,7 @@ class Poll:
                   f'Question / Name: {self.name}\n'
                   f'Label: {self.short}\n'
                   f'Anonymous: {"Yes" if self.anonymous else "No"}\n'
-                  f'Multiple choice: {"Yes" if self.multiple_choice else "No"}\n'
+                  f'# Choices: {"Multiple" if self.multiple_choice == 0 else self.multiple_choice}\n'
                   f'Answer options: {", ".join(self.options_reaction)}\n'
                   f'Allowed roles: {", ".join(self.roles) if self.roles.__len__() > 0 else "@everyone"}\n'
                   f'Weights for roles: {weight_str}\n'
@@ -795,10 +991,21 @@ class Poll:
 
                 if not name:
                     name = member.name
-                export += f'\n{name}'
+                export += f'\n{name}: '
                 if self.votes[str(user_id)]['weight'] != 1:
                     export += f' (weight: {self.votes[str(user_id)]["weight"]})'
-                export += ': ' + ', '.join([self.options_reaction[c] for c in self.votes[str(user_id)]['choices']])
+                # export += ': ' + ', '.join([self.options_reaction[c] for c in self.votes[str(user_id)]['choices']])
+                choice_text_list = []
+                for choice in self.votes[str(user_id)]['choices']:
+                    choice_text = self.options_reaction[choice]
+                    if choice in self.survey_flags:
+                        choice_text += " ("\
+                                  + self.votes[str(user_id)]["answers"][self.survey_flags.index(choice)] \
+                                  + ") "
+                    choice_text_list.append(choice_text)
+                if choice_text_list:
+                    export += ', '.join(choice_text_list)
+
             export += '\n'
         else:
             export += '--------------------------------------------\n' \
@@ -821,6 +1028,28 @@ class Poll:
                 # export += ': ' + ', '.join([self.options_reaction[c] for c in self.votes[str(user_id)]['choices']])
             export += '\n'
 
+            if self.survey_flags.__len__() > 0:
+                export += '--------------------------------------------\n' \
+                          'CUSTOM ANSWERS (RANDOM ORDER)\n' \
+                          '--------------------------------------------'
+                for i, o in enumerate(self.options_reaction):
+                    if i not in self.survey_flags:
+                        continue
+                    custom_answers = []
+                    for user_id in self.votes:
+                        if i in self.votes[str(user_id)]["choices"]:
+                            custom_answers.append(f'\n{self.votes[str(user_id)]["answers"][self.survey_flags.index(i)]}')
+
+                    export += "\n" + o + ":"
+                    if custom_answers.__len__() > 0:
+                        random.shuffle(custom_answers)  # randomize answers per question
+                        for answer in custom_answers:
+                            export += answer
+                            export += '\n'
+                    else:
+                        export += "No custom answers were submitted."
+                        export += '\n'
+
         export += ('--------------------------------------------\n'
                    'BOT DETAILS\n'
                    '--------------------------------------------\n'
@@ -854,6 +1083,13 @@ class Poll:
         self.name = d['name']
         self.short = d['short']
         self.anonymous = d['anonymous']
+
+        # backwards compatibility
+        if 'hide_count' in d.keys():
+            self.hide_count = d['hide_count']
+        else:
+            self.hide_count = False
+
         self.reaction = d['reaction']
 
         # backwards compatibility for multiple choice
@@ -872,6 +1108,13 @@ class Poll:
         self.options_reaction = d['options_reaction']
         self.options_reaction_default = d['reaction_default']
         # self.options_traditional = d['options_traditional']
+
+        # backwards compatibility
+        if 'survey_flags' in d.keys():
+            self.survey_flags = d['survey_flags']
+        else:
+            self.survey_flags = []
+
         self.roles = d['roles']
         self.weights_roles = d['weights_roles']
         self.weights_numbers = d['weights_numbers']
@@ -945,18 +1188,20 @@ class Poll:
 
         embed = await self.add_field_custom(name='**Poll Question**', value=self.name, embed=embed)
 
-        embed = await self.add_field_custom(name='**Roles**', value=', '.join(self.roles), embed=embed)
-        if len(self.weights_roles) > 0:
-            weights = []
-            for r, n in zip(self.weights_roles, self.weights_numbers):
-                weights.append(f'{r}: {n}')
-            embed = await self.add_field_custom(name='**Weights**', value=', '.join(weights), embed=embed)
+        if self.roles != ['@everyone']:
+            embed = await self.add_field_custom(name='**Roles**', value=', '.join(self.roles), embed=embed)
+            if len(self.weights_roles) > 0:
+                weights = []
+                for r, n in zip(self.weights_roles, self.weights_numbers):
+                    weights.append(f'{r}: {n}')
+                embed = await self.add_field_custom(name='**Weights**', value=', '.join(weights), embed=embed)
 
         embed = await self.add_field_custom(name='**Anonymous**', value=self.anonymous, embed=embed)
 
-        # embed = await self.add_field_custom(name='**Multiple Choice**', value=self.multiple_choice, embed=embed)
-        embed = await self.add_field_custom(name='**Deadline**', value=await self.get_poll_status(), embed=embed)
-        embed = await self.add_field_custom(name='**Author**', value=self.author.name, embed=embed)
+        if self.duration != 0:
+            embed = await self.add_field_custom(name='**Deadline**', value=await self.get_poll_status(), embed=embed)
+
+        # embed = await self.add_field_custom(name='**Author**', value=self.author.name, embed=embed)
 
         if self.reaction:
             if self.options_reaction_default:
@@ -976,34 +1221,47 @@ class Poll:
                     vote_display.append(f'{r} {self.count_votes(i)}')
                 embed = await self.add_field_custom(name=text, value=' '.join(vote_display), embed=embed)
             else:
-                embed.add_field(name='\u200b', value='\u200b', inline=False)
+                # embed.add_field(name='\u200b', value='\u200b', inline=False)
                 if await self.is_open():
-                    text = f'*Vote by adding reactions to the poll*. '
+                    head = ""
                     if self.multiple_choice == 0:
-                        text += '*You can vote for multiple options.*'
+                        head += 'You can vote for multiple options:'
                     elif self.multiple_choice == 1:
-                        text += '*You have 1 vote, but can change it.*'
+                        head += 'You have 1 vote:'
                     else:
-                        text += f'*You have {self.multiple_choice} choices and can change them.*'
+                        head += f'You can vote for {self.multiple_choice} options:'
                 else:
-                    text = f'*Final Results of the Poll* '
+                    head = f'Final Results of the Poll '
                     if self.multiple_choice == 0:
-                        text += '*(Multiple Choice).*'
+                        head += '(Multiple Choice):'
                     elif self.multiple_choice == 1:
-                        text += '*(Single Choice).*'
+                        head += '(Single Choice):'
                     else:
-                        text += f'*(With up to {self.multiple_choice} choices).*'
-                embed = await self.add_field_custom(name='**Options**', value=text, embed=embed)
+                        head += f'(With up to {self.multiple_choice} choices):'
+                # embed = await self.add_field_custom(name='**Options**', value=text, embed=embed)
+                options_text = '**' + head + '**\n'
                 for i, r in enumerate(self.options_reaction):
-                    embed = await self.add_field_custom(
-                        name=f':regional_indicator_{ascii_lowercase[i]}: {self.count_votes(i)}',
-                        value=r,
-                        embed=embed
-                    )
+                    custom_icon = ''
+                    if i in self.survey_flags:
+                        custom_icon = '🖊'
+                    options_text += f':regional_indicator_{ascii_lowercase[i]}:{custom_icon} {r}'
+                    if self.hide_count and self.open:
+                        options_text += '\n'
+                    else:
+                        options_text += f' **- {self.count_votes(i)} Votes**\n'
+                    # embed = await self.add_field_custom(
+                    #     name=f':regional_indicator_{ascii_lowercase[i]}:{custom_icon} {self.count_votes(i)}',
+                    #     value=r,
+                    #     embed=embed
+                    # )
+                embed.add_field(name='\u200b', value=options_text, inline=False)
+
         # else:
         #     embed = await self.add_field_custom(name='**Options**', value=', '.join(self.get_options()), embed=embed)
-
-        embed.set_footer(text='React with ❔ to get info. It is not a vote option.')
+        custom_text = ""
+        if len(self.survey_flags) > 0:
+            custom_text = " 🖊 next to an option means you can submit a custom answer."
+        embed.set_footer(text='React with ❔ to get info. It is not a vote option.' + custom_text)
         return embed
 
     async def post_embed(self, destination):
@@ -1129,7 +1387,7 @@ class Poll:
                 weight = max(valid_weights)
 
         if str(user.id) not in self.votes:
-            self.votes[str(user.id)] = {'weight': weight, 'choices': []}
+            self.votes[str(user.id)] = {'weight': weight, 'choices': [], 'answers': []}
         else:
             self.votes[str(user.id)]['weight'] = weight
 
@@ -1157,6 +1415,20 @@ class Poll:
                     await user.send(embed=embed)
                     # refresh_poll = False
                 else:
+                    if choice in self.survey_flags:
+                        if len(self.votes[str(user.id)]['answers']) != len(self.survey_flags):
+                            self.votes[str(user.id)]['answers'] = ['' for i in range(len(self.survey_flags))]
+                        custom_input = await self.ask_for_input_DM(
+                            user,
+                            "Custom Answer",
+                            "For this vote option you can provide a custom reply. "
+                            "Note that everyone will be able to see the answer. If you don't want to provide a "
+                            "custom answer, type \"-\""
+                        )
+                        if not custom_input or custom_input.lower() == "-":
+                            custom_input = "No Answer"
+                        self.votes[str(user.id)]['answers'][self.survey_flags.index(choice)] = custom_input
+
                     self.votes[str(user.id)]['choices'].append(choice)
                     self.votes[str(user.id)]['choices'] = list(set(self.votes[str(user.id)]['choices']))
             # else:
@@ -1175,11 +1447,8 @@ class Poll:
 
         # commit
         await self.save_to_db()
-        asyncio.ensure_future(message.edit(embed=await self.generate_embed()))
-
-
-
-
+        if not self.hide_count:
+            asyncio.ensure_future(message.edit(embed=await self.generate_embed()))
 
     async def unvote(self, user, option, message, lock):
         if not await self.is_open():
@@ -1205,9 +1474,12 @@ class Poll:
 
         if choice != 'invalid' and choice in self.votes[str(user.id)]['choices']:
             try:
+                if choice in self.survey_flags and len(self.votes[str(user.id)]['answers']) == len(self.survey_flags):
+                    self.votes[str(user.id)]['answers'][self.survey_flags.index(choice)] = ''
                 self.votes[str(user.id)]['choices'].remove(choice)
                 await self.save_to_db()
-                asyncio.ensure_future(message.edit(embed=await self.generate_embed()))
+                if not self.hide_count:
+                    asyncio.ensure_future(message.edit(embed=await self.generate_embed()))
             except ValueError:
                 pass
 
diff --git a/pollmaster.py b/pollmaster.py
index 89be6d7..f147bf8 100644
--- a/pollmaster.py
+++ b/pollmaster.py
@@ -62,7 +62,7 @@ async def on_ready():
     try:
         db_server_ids = [entry['_id'] async for entry in bot.db.config.find({}, {})]
         for server in bot.guilds:
-            if server.id not in db_server_ids:
+            if str(server.id) not in db_server_ids:
                 # create new config entry
                 await bot.db.config.update_one(
                     {'_id': str(server.id)},

From 13a27bac4a44cdc763842a7f3e3b8bf24f37da38 Mon Sep 17 00:00:00 2001
From: Matthias Nadler <matthias.nadler@unibas.ch>
Date: Tue, 18 Jun 2019 18:10:52 +0200
Subject: [PATCH 2/4] most of work for 2.4 done

finished functionality and help,  documentation (readme) not done
- added mention
- finished debug
- improved poll info
- finished cmd
- finished to_command
---
 cogs/admin.py                              |  57 +++++++++
 cogs/db_api.py                             |   4 +
 cogs/help.py                               | 142 ++++++++++++++++-----
 cogs/poll_controls.py                      |   1 +
 essentials/multi_server.py                 |   4 +-
 export/444493407784665108_LameKestrel.txt  |  37 ++++++
 export/444493407784665108_TameOwl.txt      |  37 ++++++
 export/444493407784665108_kaka.txt         |  37 ++++++
 export/444493407784665108_keke3.txt        |  37 ++++++
 export/444493407784665108_llll.txt         |  36 ++++++
 export/444493407784665108_okaaydude.txt    |  45 +++++++
 export/544514197262696469_abcde.txt        |  38 ++++++
 models/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 143 bytes
 models/__pycache__/poll.cpython-36.pyc     | Bin 0 -> 42291 bytes
 models/poll.py                             |  23 +++-
 pollmaster.py                              |  18 ++-
 16 files changed, 471 insertions(+), 45 deletions(-)
 create mode 100644 cogs/admin.py
 create mode 100644 export/444493407784665108_LameKestrel.txt
 create mode 100644 export/444493407784665108_TameOwl.txt
 create mode 100644 export/444493407784665108_kaka.txt
 create mode 100644 export/444493407784665108_keke3.txt
 create mode 100644 export/444493407784665108_llll.txt
 create mode 100644 export/444493407784665108_okaaydude.txt
 create mode 100644 export/544514197262696469_abcde.txt
 create mode 100644 models/__pycache__/__init__.cpython-36.pyc
 create mode 100644 models/__pycache__/poll.cpython-36.pyc

diff --git a/cogs/admin.py b/cogs/admin.py
new file mode 100644
index 0000000..d84498b
--- /dev/null
+++ b/cogs/admin.py
@@ -0,0 +1,57 @@
+import logging
+
+from discord.ext import commands
+
+
+class Admin(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+
+    # every commands needs owner permissions
+    async def cog_check(self, ctx):
+        return self.bot.owner == ctx.author
+
+    async def cog_command_error(self, ctx, error):
+        if isinstance(error, commands.CheckFailure):
+            await ctx.send("Only the owner can use this module. Join the support discord server if you are having "
+                           "any problems. This usage has been logged.")
+            logger.warning(f'User {ctx.author} ({ctx.author.id}) has tried to access a restricted '
+                           f'command via {ctx.message.content}.')
+        elif isinstance(error, commands.MissingRequiredArgument):
+            await ctx.send("Missing a required argument for this command.")
+        else:
+            logger.warning(error)
+
+    @commands.command(aliases=['r'])
+    async def reload(self, ctx, *, cog):
+        logger.info(f'Trying to reload cog: cogs.{cog}.')
+
+        reply = ''
+        try:
+            self.bot.reload_extension('cogs.'+cog)
+            reply = f'Extension "cogs.{cog}" successfully reloaded.'
+        except commands.ExtensionNotFound:
+            reply = f'Extension "cogs.{cog}" not found.'
+        except commands.NoEntryPointError:
+            reply = f'Extension "cogs.{cog}" is missing a setup function.'
+        except commands.ExtensionFailed:
+            reply = f'Extension "cogs.{cog}" failed to start.'
+        except commands.ExtensionNotLoaded:
+            reply = f'Extension "cogs.{cog}" is not loaded... trying to load it. '
+            try:
+                self.bot.load_extension('cogs.'+cog)
+            except commands.ExtensionAlreadyLoaded:
+                reply += f'Could not load or reload extension since it is already loaded...'
+            except commands.ExtensionNotFound:
+                reply += f'Extension "cogs.{cog}" not found.'
+            except commands.ExtensionFailed:
+                reply = f'Extension "cogs.{cog}" failed to start.'
+        finally:
+            logger.info(reply)
+            await ctx.send(reply)
+
+
+def setup(bot):
+    global logger
+    logger = logging.getLogger('bot')
+    bot.add_cog(Admin(bot))
\ No newline at end of file
diff --git a/cogs/db_api.py b/cogs/db_api.py
index 9a6426f..f0d0a0d 100644
--- a/cogs/db_api.py
+++ b/cogs/db_api.py
@@ -25,6 +25,10 @@ class DiscordBotsOrgAPI(commands.Cog):
                 if SETTINGS.mode == 'production':
                     await self.dblpy.post_server_count()
                 logger.info('posted server count ({})'.format(len(self.bot.guilds)))
+                sum_users = 0
+                for guild in self.bot.guilds:
+                    sum_users += len(guild.members)
+                logger.info(f'total users served by the bot: {sum_users}')
             except Exception as e:
                 logger.exception('Failed to post server count\n{}: {}'.format(type(e).__name__, e))
             await asyncio.sleep(1800)
diff --git a/cogs/help.py b/cogs/help.py
index 4b25dad..c083d22 100644
--- a/cogs/help.py
+++ b/cogs/help.py
@@ -12,11 +12,10 @@ class Help(commands.Cog):
 
     def __init__(self, bot):
         self.bot = bot
-        self.pages = ['🏠', '🆕', '🔍', '🕹', '🛠', '💖']
+        self.pages = ['🏠', '🆕', '🔍', '🕹', '🛠', '❔', '💖']
 
     async def embed_list_reaction_handler(self, ctx, page, pre, msg=None):
         embed = self.get_help_embed(page, pre)
-
         if msg is None:
             msg = await ctx.send(embed=embed)
             # add reactions
@@ -39,8 +38,6 @@ class Help(commands.Cog):
                 await reaction.message.remove_reaction(reaction.emoji, user)
             return reaction
 
-
-
     def get_help_embed(self, page, pre):
 
         title = f' Pollmaster Help - React with an emoji to learn more about a topic!'
@@ -49,9 +46,10 @@ class Help(commands.Cog):
         embed.set_footer(text='Use reactions to navigate the help. This message will self-destruct in 3 minutes.')
 
         if page == '🏠':
-            ## POLL CREATION SHORT
+            # POLL CREATION SHORT
             embed.add_field(name='🆕 Making New Polls',
-                            value=f'`{pre}quick` | `{pre}new` | `{pre}advanced` | `{pre}prepare` | `{pre}cmd <args>`', inline=False)
+                            value=f'`{pre}quick` | `{pre}new` | `{pre}advanced` | `{pre}prepare` | `{pre}cmd <args>`',
+                            inline=False)
             # embed.add_field(name='Commands', value=f'`{pre}quick` | `{pre}new` | `{pre}prepared`', inline=False)
             # embed.add_field(name='Arguments', value=f'Arguments: `<poll question>` (optional)', inline=False)
             # embed.add_field(name='Examples', value=f'Examples: `{pre}new` | `{pre}quick What is the greenest color?`',
@@ -59,63 +57,72 @@ class Help(commands.Cog):
 
             ## POLL CONTROLS
             embed.add_field(name='🔍 Show Polls',
-                            value=f'`{pre}show (label)`', inline=False)
+                            value=f'`{pre}show` | `{pre}show <label>` | `{pre}show <category>`', inline=False)
             # embed.add_field(name='Command', value=f'`{pre}show (label)`', inline=False)
             # embed.add_field(name='Arguments', value=f'Arguments: `open` (default) | `closed` | `prepared` | '
             #                                         f'`<poll_label>` (optional)', inline=False)
             # embed.add_field(name='Examples', value=f'Examples: `{pre}show` | `{pre}show closed` | `{pre}show mascot`',
             #                 inline=False)
 
-            ## POLL CONTROLS
+            # POLL CONTROLS
             embed.add_field(name='🕹 Poll Controls',
-                            value=f'`{pre}close` | `{pre}export` | `{pre}delete` | `{pre}activate` ', inline=False)
+                            value=f'`{pre}copy` | `{pre}close` | `{pre}export` | `{pre}delete` | `{pre}activate` ',
+                            inline=False)
             # embed.add_field(name='Commands', value=f'`{pre}close` | `{pre}export` | `{pre}delete` | `{pre}activate` ',
             #                 inline=False)
             # embed.add_field(name='Arguments', value=f'Arguments: <poll_label> (required)', inline=False)
             # embed.add_field(name='Examples', value=f'Examples: `{pre}close mascot` | `{pre}export proposal`',
             #                 inline=False)
 
-            ## POLL CONTROLS
+            # POLL CONTROLS
             embed.add_field(name='🛠 Configuration',
-                            value=f'`{pre}userrole (role)` | `{pre}adminrole (role)` | `{pre}prefix <new_prefix>` ',
+                            value=f'`{pre}userrole [role]` | `{pre}adminrole [role]` | `{pre}prefix <new_prefix>` ',
                             inline=False
                             )
-            # embed.add_field(name='Commands',
-            #                 value=f'`{pre}userrole <role>` | `{pre}adminrole <role>` | `{pre}prefix <new_prefix>` ',
-            #                 inline=False)
 
-            ## ABOUT
+            # DEBUGGING
+            embed.add_field(name='❔ Debugging',
+                            value=f'`@debug` | `@mention` | `@mention <tag>` ',
+                            inline=False
+                            )
+            # ABOUT
             embed.add_field(name='💖 About Pollmaster',
                             value='More infos about Pollmaster, the developer, where to go for further help and how you can support us.',
                             inline=False)
 
         elif page == '🆕':
             embed.add_field(name='🆕 Making New Polls',
-                            value='There are three ways to create a new poll. For all three commands you can either just '
-                                  'type the command or type the command followed by the question to skip that first step.'
-                                  'Your Members need the <admin> or <user> role to use these commands. More in 🛠 Configuration.',
+                            value='There are four ways to create a new poll. For all the commands you can either just '
+                                  'type the command or type the command followed by the question to skip the first step.'
+                                  'Your Members need the <admin> or <user> role to use these commands. '
+                                  'More on user rights in 🛠 Configuration.',
                             inline=False)
-            embed.add_field(name=f'🔹 **Quick Poll:** `{pre}quick <poll question>` (optional)',
+            embed.add_field(name=f'🔹 **Quick Poll:** `{pre}quick`',
                             value='If you just need a quick poll, this is the way to go. All you have to specify is the '
                                   'question and your answers; the rest will be set to default values.',
                             inline=False)
-            embed.add_field(name=f'🔹 **All Features:** `{pre}new <poll question>` (optional)',
-                            value='This command gives you full control over your poll. A step by step wizard will guide '
+            embed.add_field(name=f'🔹 **Basic Poll:** `{pre}new`',
+                            value='This command gives control over the most common settings. A step by step wizard will guide '
                                   'you through the process and you can specify options such as Multiple Choice, '
-                                  'Anonymous Voting, Role Restriction, Role Weights and Deadline.',
+                                  'Anonymous Voting and Deadline.',
                             inline=False)
-            embed.add_field(name=f'🔹 **Prepare and Schedule:** `{pre}prepare <poll question>` (optional)',
-                            value=f'Similar to `{pre}new`, this gives you all the options. But additionally, the poll will '
+            embed.add_field(name=f'🔹 **Advanced Poll:** `{pre}advanced`',
+                            value='This command gives you full control over your poll. A step by step wizard will guide '
+                                  'you through the process and you can specify additional options such as Hide Vote Count, '
+                                  'Role Restrictions, Role Weights or Custom Write-In Answers (Survey Flags).',
+                            inline=False)
+            embed.add_field(name=f'🔹 **Prepare and Schedule:** `{pre}prepare`',
+                            value=f'Similar to `{pre}advanced`, this gives you all the options. But additionally, the poll will '
                                   'be set to \'inactive\'. You can specify if the poll should activate at a certain time '
                                   f'and/or if you would like to manually `{pre}activate` it. '
                                   'Perfect if you are preparing for a team meeting!',
                             inline=False)
-            embed.add_field(name=f'🔹 **-Advanced- Commandline:** `{pre}cmd <args>`',
+            embed.add_field(name=f'🔹 **-Advanced- Commandline:** `{pre}cmd <arguments>`',
                             value=f'For the full syntax type `{pre}cmd help`\n'
                                   f'Similar to version 1 of the bot, with this command you can create a poll in one message. '
                                   f'Pass all the options you need via command line arguments, the rest will be set to '
                                   f'default values. The wizard will step in for invalid arguments.\n'
-                                  f'Example: `{pre}cmd -q "Which colors?" -l colors -o "green, blue, red" -mc -a`',
+                                  f'Example: `{pre}cmd -q "Which colors?" -l colors -o "green, blue, red" -h -a`',
                             inline=False)
 
         elif page == '🔍':
@@ -137,9 +144,15 @@ class Help(commands.Cog):
                             inline=False)
         elif page == '🕹':
             embed.add_field(name='🕹 Poll Controls',
-                            value='All these commands can only be used by an <admin> or by the author of the poll. '
+                            value='All these commands except copy can only be used by an <admin> or by the author of the poll. '
                                   'Go to 🛠 Configuration for more info on the permissions.',
                             inline=False)
+            embed.add_field(name=f'🔹 **Copy** `{pre}copy <poll_label>`',
+                            value='This will give you a cmd string that you can post into any channel to create a copy'
+                                  'of the specified poll. It will increment the label and depending on the settings, '
+                                  'you might need to add missing information like a new deadline. '
+                                  f'\nFor more info, see: `{pre}cmd help`.',
+                            inline=False)
             embed.add_field(name=f'🔹 **Close** `{pre}close <poll_label>`',
                             value='Polls will close automatically when their deadline is reached. But you can always '
                                   'close them manually by using this command. A closed poll will lock in the votes so '
@@ -180,6 +193,20 @@ class Help(commands.Cog):
                                   'whitespace, use "\w" instead of " " (discord deletes trailing whitespaces).',
                             inline=False)
 
+        elif page == '❔':
+            embed.add_field(name='❔ Debugging',
+                            value='These commands are independent of your server prefix and serve to debug the bot.',
+                            inline=False)
+            embed.add_field(name=f'🔹 **Debug:** `@debug`',
+                            value='This command will check the required permissions in the channel it is used and'
+                                  'generate a short report with suggestions on your next actions.'
+                                  'If you are stuck, please visit the support discord server.',
+                            inline=False)
+            embed.add_field(name=f'🔹 **Mention:** `@mention` | `@mention prefix`',
+                            value='This is a prefix independent command to retrieve your prefix in case you changed '
+                                  'and forgot it. More `@mention` tags might be added in the future.',
+                            inline=False)
+
         elif page == '💖':
             embed.add_field(name='💖 Pollmaster 💖',
                             value='If you enjoy the bot, you can show your appreciation by giving him an upvote on Discordbots.',
@@ -205,8 +232,15 @@ class Help(commands.Cog):
         return embed
 
     @commands.command()
-    async def help(self, ctx, *, topic=None):
+    async def help(self, ctx):
         server = await ask_for_server(self.bot, ctx.message)
+        if not server:
+            return
+
+        if not ctx.message.channel.permissions_for(server.me).embed_links:
+            await ctx.send("Missing permissions. Type \"@debug.\"")
+            return
+
         pre = await get_server_pre(self.bot, server)
         rct = 1
         while rct is not None:
@@ -217,13 +251,16 @@ class Help(commands.Cog):
                 page = rct.emoji
                 msg = rct.message
             rct = await self.embed_list_reaction_handler(ctx, page, pre, msg)
-            # print(res.user, res.reaction, res.reaction.emoji)
         # cleanup
-        await ctx.message.delete()
+        try:
+            await ctx.message.delete()
+        except PermissionError:
+            pass
 
+    # @mention and @debug commands
     @commands.Cog.listener()
     async def on_message(self, message):
-        if message.content.startswith("@mention "):
+        if message.content.startswith("@mention"):
             channel = message.channel
             if not isinstance(channel, discord.TextChannel):
                 await channel.send("@mention can only be used in a server text channel.")
@@ -234,12 +271,23 @@ class Help(commands.Cog):
                 await channel.send("Could not determine your server.")
                 return
 
-            tag = message.content.split()[1].lower()
+            if message.content == "@mention":
+                await channel.send("The following @mention tags are available:\n🔹 @mention prefix")
+                return
+
+            try:
+                tag = message.content.split()[1].lower()
+            except IndexError:
+                await channel.send("Wrong formatting. Type \"@mention\" or \"@mention <tag>\".")
+                return
+
             if tag == "prefix":
                 pre = await get_server_pre(self.bot, guild)
                 # await channel.send(f'The prefix for this server/channel is: \n {pre} \n To change it type: \n'
                 #                    f'{pre}prefix <new_prefix>')
                 await channel.send(pre)
+            else:
+                await channel.send(f'Tag "{tag}" not found. Type "@mention" for a list of tags.')
 
         elif message.content == "@debug":
             channel = message.channel
@@ -253,17 +301,41 @@ class Help(commands.Cog):
                 return
 
             status_msg = ''
+            setup_correct = True
 
+            # check send message permissions
             permissions = channel.permissions_for(guild.me)
             if not permissions.send_messages:
-                await message.author.send(f'I don\'t have permission to send text messages in channel {channel} '
-                                          f'on server {guild}')
+                await message.author.send(f'I don\'t have permission to send text messages in channel "{channel}" '
+                                          f'on server "{guild}"')
                 return
 
-            status_msg += f' ✅ Sending messages\n'
+            status_msg += ' ✅ Sending text messages\n'
+
+            # check embed link permissions
+            if permissions.embed_links:
+                status_msg += '✅ Sending embedded messages\n'
+            else:
+                status_msg += '❗ Sending embedded messages. I need permissions to embed links!\n'
+                setup_correct = False
+
+            # check manage messages
+            if permissions.manage_messages:
+                status_msg += '✅ Deleting messages and reactions\n'
+            else:
+                status_msg += '❗ Deleting messages and reactions. I need the manage messages permission!\n'
+                setup_correct = False
+
+            if setup_correct:
+                status_msg += 'No action required. Your permissions are set up correctly for this channel. \n' \
+                              'If the bot does not work, feel free to join the support discord server.'
+            else:
+                status_msg += 'Please try to fix the issues above. \nIf you are still having problems, ' \
+                              'visit the support discord server.'
 
             await channel.send(status_msg)
 
+
 def setup(bot):
     global logger
     logger = logging.getLogger('bot')
diff --git a/cogs/poll_controls.py b/cogs/poll_controls.py
index 3ce190a..7c39f96 100644
--- a/cogs/poll_controls.py
+++ b/cogs/poll_controls.py
@@ -518,6 +518,7 @@ class PollControls(commands.Cog):
             await poll.set_short(ctx)
             await poll.set_anonymous(ctx)
             await poll.set_options_reaction(ctx)
+            await poll.set_survey_flags(ctx, force='0')
             await poll.set_multiple_choice(ctx)
             await poll.set_hide_vote_count(ctx, force='no')
             await poll.set_roles(ctx, force='all')
diff --git a/essentials/multi_server.py b/essentials/multi_server.py
index 1993343..f81349c 100644
--- a/essentials/multi_server.py
+++ b/essentials/multi_server.py
@@ -148,7 +148,7 @@ async def ask_for_channel(ctx, bot, server, message):
         def check(m):
             return message.author.id == m.author.id
         try:
-            reply = await bot.wait_for('message', timeout=60)
+            reply = await bot.wait_for('message', timeout=60, check=check)
         except asyncio.TimeoutError:
             pass
         else:
@@ -161,4 +161,4 @@ async def ask_for_channel(ctx, bot, server, message):
                     nr = int(reply.content)
                     if 0 < nr <= channel_list.__len__():
                         valid_reply = True
-    return channel_list[nr - 1]
\ No newline at end of file
+    return channel_list[nr - 1]
diff --git a/export/444493407784665108_LameKestrel.txt b/export/444493407784665108_LameKestrel.txt
new file mode 100644
index 0000000..8280a71
--- /dev/null
+++ b/export/444493407784665108_LameKestrel.txt
@@ -0,0 +1,37 @@
+--------------------------------------------
+POLLMASTER DISCORD EXPORT
+--------------------------------------------
+Server name (ID): VoteBotTesting (444493407784665108)
+Owner of the poll: Newti
+Time of creation: 17-Jun-2019 14:45 
+--------------------------------------------
+POLL SETTINGS
+--------------------------------------------
+Question / Name: asf
+Label: LameKestrel
+Anonymous: No
+# Choices: 1
+Answer options: ✅, ❎
+Allowed roles: @everyone
+Weights for roles: No weights
+Deadline: No deadline
+--------------------------------------------
+POLL RESULTS
+--------------------------------------------
+Number of participants: 1
+Raw results: ✅: 0, ❎: 1
+Weighted results: ✅: 0, ❎: 1
+Winning option: ❎ with 1 votes
+--------------------------------------------
+DETAILED POLL RESULTS
+--------------------------------------------
+Dev|Newti: ❎
+--------------------------------------------
+BOT DETAILS
+--------------------------------------------
+Creator: Newti#0654
+Link to invite, vote for or support Pollmaster:
+https://discordbots.org/bot/444514223075360800
+--------------------------------------------
+END OF FILE
+--------------------------------------------
diff --git a/export/444493407784665108_TameOwl.txt b/export/444493407784665108_TameOwl.txt
new file mode 100644
index 0000000..1f3b053
--- /dev/null
+++ b/export/444493407784665108_TameOwl.txt
@@ -0,0 +1,37 @@
+--------------------------------------------
+POLLMASTER DISCORD EXPORT
+--------------------------------------------
+Server name (ID): VoteBotTesting (444493407784665108)
+Owner of the poll: Newti
+Time of creation: 17-Jun-2019 14:14 
+--------------------------------------------
+POLL SETTINGS
+--------------------------------------------
+Question / Name: Oh i forgot
+Label: TameOwl
+Anonymous: No
+# Choices: 1
+Answer options: yes, no, maybe
+Allowed roles: @everyone
+Weights for roles: No weights
+Deadline: No deadline
+--------------------------------------------
+POLL RESULTS
+--------------------------------------------
+Number of participants: 1
+Raw results: yes: 1, no: 0, maybe: 0
+Weighted results: yes: 1, no: 0, maybe: 0
+Winning option: yes with 1 votes
+--------------------------------------------
+DETAILED POLL RESULTS
+--------------------------------------------
+Dev|Newti: yes (test) 
+--------------------------------------------
+BOT DETAILS
+--------------------------------------------
+Creator: Newti#0654
+Link to invite, vote for or support Pollmaster:
+https://discordbots.org/bot/444514223075360800
+--------------------------------------------
+END OF FILE
+--------------------------------------------
diff --git a/export/444493407784665108_kaka.txt b/export/444493407784665108_kaka.txt
new file mode 100644
index 0000000..1e1e35b
--- /dev/null
+++ b/export/444493407784665108_kaka.txt
@@ -0,0 +1,37 @@
+--------------------------------------------
+POLLMASTER DISCORD EXPORT
+--------------------------------------------
+Server name (ID): VoteBotTesting (444493407784665108)
+Owner of the poll: Newti
+Time of creation: 17-Jun-2019 15:15 
+--------------------------------------------
+POLL SETTINGS
+--------------------------------------------
+Question / Name: Aodjasd
+Label: kaka
+Anonymous: No
+# Choices: Multiple
+Answer options: abc, def, ghi, jkl
+Allowed roles: @everyone
+Weights for roles: No weights
+Deadline: 17-Jun-2019 15:16 GMT
+--------------------------------------------
+POLL RESULTS
+--------------------------------------------
+Number of participants: 1
+Raw results: abc: 1, def: 0, ghi: 1, jkl: 0
+Weighted results: abc: 1, def: 0, ghi: 1, jkl: 0
+Winning options: abc, ghi with 1 votes
+--------------------------------------------
+DETAILED POLL RESULTS
+--------------------------------------------
+Dev|Newti: abc, ghi (okay dude this is my textasdasd) 
+--------------------------------------------
+BOT DETAILS
+--------------------------------------------
+Creator: Newti#0654
+Link to invite, vote for or support Pollmaster:
+https://discordbots.org/bot/444514223075360800
+--------------------------------------------
+END OF FILE
+--------------------------------------------
diff --git a/export/444493407784665108_keke3.txt b/export/444493407784665108_keke3.txt
new file mode 100644
index 0000000..6a33235
--- /dev/null
+++ b/export/444493407784665108_keke3.txt
@@ -0,0 +1,37 @@
+--------------------------------------------
+POLLMASTER DISCORD EXPORT
+--------------------------------------------
+Server name (ID): VoteBotTesting (444493407784665108)
+Owner of the poll: Newti
+Time of creation: 18-Jun-2019 11:03 
+--------------------------------------------
+POLL SETTINGS
+--------------------------------------------
+Question / Name: asdasd
+Label: keke3
+Anonymous: Yes
+# Choices: 3
+Answer options: asd, fgh, jkl, 121, asd
+Allowed roles: @everyone
+Weights for roles: No weights
+Deadline: 18-Jun-2019 11:04 GMT
+--------------------------------------------
+POLL RESULTS
+--------------------------------------------
+Number of participants: 1
+Raw results: asd: 0, fgh: 1, jkl: 1, 121: 0, asd: 1
+Weighted results: asd: 0, fgh: 1, jkl: 1, 121: 0, asd: 1
+Winning options: fgh, jkl, asd with 1 votes
+--------------------------------------------
+LIST OF PARTICIPANTS
+--------------------------------------------
+Dev|Newti
+--------------------------------------------
+BOT DETAILS
+--------------------------------------------
+Creator: Newti#0654
+Link to invite, vote for or support Pollmaster:
+https://discordbots.org/bot/444514223075360800
+--------------------------------------------
+END OF FILE
+--------------------------------------------
diff --git a/export/444493407784665108_llll.txt b/export/444493407784665108_llll.txt
new file mode 100644
index 0000000..5235aaf
--- /dev/null
+++ b/export/444493407784665108_llll.txt
@@ -0,0 +1,36 @@
+--------------------------------------------
+POLLMASTER DISCORD EXPORT
+--------------------------------------------
+Server name (ID): VoteBotTesting (444493407784665108)
+Owner of the poll: Newti
+Time of creation: 12-Apr-2019 15:21 
+--------------------------------------------
+POLL SETTINGS
+--------------------------------------------
+Question / Name: asd
+Label: llll
+Anonymous: No
+Choices: Multiple
+Answer options: in favour, against, abstaining
+Allowed roles: @everyone
+Weights for roles: No weights
+Deadline: 12-Apr-2019 21:21 GMT
+--------------------------------------------
+POLL RESULTS
+--------------------------------------------
+Number of participants: 1
+Raw results: in favour: 0, against: 0, abstaining: 0
+Weighted results: in favour: 0, against: 0, abstaining: 0
+Winning options: in favour, against, abstaining with 0 votes
+--------------------------------------------
+DETAILED POLL RESULTS
+--------------------------------------------
+--------------------------------------------
+BOT DETAILS
+--------------------------------------------
+Creator: Newti#0654
+Link to invite, vote for or support Pollmaster:
+https://discordbots.org/bot/444514223075360800
+--------------------------------------------
+END OF FILE
+--------------------------------------------
diff --git a/export/444493407784665108_okaaydude.txt b/export/444493407784665108_okaaydude.txt
new file mode 100644
index 0000000..251861d
--- /dev/null
+++ b/export/444493407784665108_okaaydude.txt
@@ -0,0 +1,45 @@
+--------------------------------------------
+POLLMASTER DISCORD EXPORT
+--------------------------------------------
+Server name (ID): VoteBotTesting (444493407784665108)
+Owner of the poll: Newti
+Time of creation: 17-Jun-2019 14:40 
+--------------------------------------------
+POLL SETTINGS
+--------------------------------------------
+Question / Name: Andasd
+Label: okaaydude
+Anonymous: Yes
+# Choices: Multiple
+Answer options: abcd, efg, hji, asd
+Allowed roles: @everyone
+Weights for roles: No weights
+Deadline: 17-Jun-2019 14:50 GMT
+--------------------------------------------
+POLL RESULTS
+--------------------------------------------
+Number of participants: 1
+Raw results: abcd: 1, efg: 0, hji: 1, asd: 1
+Weighted results: abcd: 1, efg: 0, hji: 1, asd: 1
+Winning options: abcd, hji, asd with 1 votes
+--------------------------------------------
+LIST OF PARTICIPANTS
+--------------------------------------------
+Dev|Newti
+--------------------------------------------
+CUSTOM ANSWERS (RANDOM ORDER)
+--------------------------------------------
+abcd:
+test
+
+asd:
+No Answer
+--------------------------------------------
+BOT DETAILS
+--------------------------------------------
+Creator: Newti#0654
+Link to invite, vote for or support Pollmaster:
+https://discordbots.org/bot/444514223075360800
+--------------------------------------------
+END OF FILE
+--------------------------------------------
diff --git a/export/544514197262696469_abcde.txt b/export/544514197262696469_abcde.txt
new file mode 100644
index 0000000..7fb1995
--- /dev/null
+++ b/export/544514197262696469_abcde.txt
@@ -0,0 +1,38 @@
+--------------------------------------------
+POLLMASTER DISCORD EXPORT
+--------------------------------------------
+Server name (ID): Pollmaster HQ (544514197262696469)
+Owner of the poll: Newti
+Time of creation: 24-Apr-2019 07:51 
+--------------------------------------------
+POLL SETTINGS
+--------------------------------------------
+Question / Name: Abcde
+Label: abcde
+Anonymous: No
+# Choices: Multiple
+Answer options: abc, def, ghi, jkl
+Allowed roles: @everyone
+Weights for roles: No weights
+Deadline: 24-Apr-2019 08:51 GMT
+--------------------------------------------
+POLL RESULTS
+--------------------------------------------
+Number of participants: 2
+Raw results: abc: 2, def: 2, ghi: 1, jkl: 1
+Weighted results: abc: 2, def: 2, ghi: 1, jkl: 1
+Winning options: abc, def with 2 votes
+--------------------------------------------
+DETAILED POLL RESULTS
+--------------------------------------------
+Newti: abc, def, ghi, jkl
+Page of the Reach: abc, def
+--------------------------------------------
+BOT DETAILS
+--------------------------------------------
+Creator: Newti#0654
+Link to invite, vote for or support Pollmaster:
+https://discordbots.org/bot/444514223075360800
+--------------------------------------------
+END OF FILE
+--------------------------------------------
diff --git a/models/__pycache__/__init__.cpython-36.pyc b/models/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..88307b0cf7c87c88c9b0b2d80f49dd6f8ccfaf73
GIT binary patch
literal 143
zcmXr!<>e|&*%HG51dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnFB@m8n9$<XqT-l5
z*Yc7Wm;B_?+|<01;+TNSl8pSkn1cMAoZQ6XlGLJ@-29Z(oZ^`H_{_Y_lK6PNg34PQ
RHbBABoK!oIsl`Cd003l$B!~b2

literal 0
HcmV?d00001

diff --git a/models/__pycache__/poll.cpython-36.pyc b/models/__pycache__/poll.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a82c806301199a7c494810d8c15ed0a3efdfacbc
GIT binary patch
literal 42291
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

literal 0
HcmV?d00001

diff --git a/models/poll.py b/models/poll.py
index 4f0132a..40b1f9d 100644
--- a/models/poll.py
+++ b/models/poll.py
@@ -829,7 +829,7 @@ class Poll:
             return m.author == user
 
         try:
-            reply = await self.bot.wait_for('message', timeout=15, check=check)
+            reply = await self.bot.wait_for('message', timeout=120, check=check)
             if reply and reply.content:
                 reply = reply.content
             else:
@@ -878,7 +878,9 @@ class Poll:
         else:
             cmd += " -o \"" + ", ".join(self.options_reaction) + "\""
 
-        cmd += " -sf \"" + ", ".join([str(x+1) for x in self.survey_flags]) + "\""
+        if self.survey_flags:
+            cmd += " -sf \"" + ", ".join([str(x+1) for x in self.survey_flags]) + "\""
+
         cmd += " -mc \"" + str(self.multiple_choice) + "\""
         if self.hide_count:
             cmd += " -h"
@@ -1408,8 +1410,23 @@ class Poll:
                 # refresh_poll = False
             else:
                 if self.multiple_choice > 0 and self.votes[str(user.id)]['choices'].__len__() >= self.multiple_choice:
+                    # # auto unvote for single choice non anonymous
+                    # if self.votes[str(user.id)]['choices'].__len__() == 1 and not self.anonymous:
+                    #     prev_choice = self.votes[str(user.id)]['choices'][0]
+                    #     if self.options_reaction_default:
+                    #         emoji = self.options_reaction[prev_choice]
+                    #     else:
+                    #         emoji = AZ_EMOJIS[prev_choice]
+                    #     await message.remove_reaction(emoji, user)
+                    # else:
                     say_text = f'You have reached the **maximum choices of {self.multiple_choice}** for this poll. ' \
-                               f'Before you can vote again, you need to unvote one of your choices.'
+                               f'Before you can vote again, you need to unvote one of your choices.\n' \
+                               f'Your current choices are:\n'
+                    for c in self.votes[str(user.id)]['choices']:
+                        if self.options_reaction_default:
+                            say_text += f'{self.options_reaction[c]}\n'
+                        else:
+                            say_text += f'{AZ_EMOJIS[c]} {self.options_reaction[c]}\n'
                     embed = discord.Embed(title='', description=say_text, colour=SETTINGS.color)
                     embed.set_author(name='Pollmaster', icon_url=SETTINGS.author_icon)
                     await user.send(embed=embed)
diff --git a/pollmaster.py b/pollmaster.py
index f147bf8..169d90e 100644
--- a/pollmaster.py
+++ b/pollmaster.py
@@ -43,7 +43,7 @@ ch.setFormatter(formatter)
 logger.addHandler(fh)
 logger.addHandler(ch)
 
-extensions = ['cogs.config', 'cogs.poll_controls', 'cogs.help', 'cogs.db_api']
+extensions = ['cogs.config', 'cogs.poll_controls', 'cogs.help', 'cogs.db_api', 'cogs.admin']
 for ext in extensions:
     bot.load_extension(ext)
 
@@ -56,7 +56,6 @@ async def on_ready():
     bot.db = mongo.pollmaster
     bot.session = aiohttp.ClientSession()
     print(bot.db)
-    await bot.change_presence(status=discord.Game(name=f'pm!help - v2.2'))
 
     # check discord server configs
     try:
@@ -78,11 +77,19 @@ async def on_ready():
 
     bot.locks = {}
     bot.message_cache = MessageCache(bot)
-    print("Servers verified. Bot running.")
 
+    game = discord.Game("Democracy 4")
+    await bot.change_presence(status=discord.Status.online, activity=game)
+
+    print("Servers verified. Bot running.")
 
 @bot.event
 async def on_command_error(ctx, e):
+
+    if ctx.cog.qualified_name == "Admin":
+        # Admin cog handles the errors locally
+        return
+
     if SETTINGS.log_errors:
         ignored_exceptions = (
             commands.MissingRequiredArgument,
@@ -96,7 +103,7 @@ async def on_command_error(ctx, e):
 
         if isinstance(e, ignored_exceptions):
             # log warnings
-            logger.warning(f'{type(e).__name__}: {e}\n{"".join(traceback.format_tb(e.__traceback__))}')
+            # logger.warning(f'{type(e).__name__}: {e}\n{"".join(traceback.format_tb(e.__traceback__))}')
             return
 
         # log error
@@ -117,6 +124,7 @@ async def on_command_error(ctx, e):
         # if SETTINGS.mode == 'development':
         raise e
 
+
 @bot.event
 async def on_guild_join(server):
     result = await bot.db.config.find_one({'_id': str(server.id)})
@@ -128,4 +136,4 @@ async def on_guild_join(server):
         )
         bot.pre[str(server.id)] = 'pm!'
 
-bot.run(SETTINGS.bot_token)
\ No newline at end of file
+bot.run(SETTINGS.bot_token)

From d48bead3119f8cb7b1590d780468d8529b48181a Mon Sep 17 00:00:00 2001
From: Matthias Nadler <matthias.nadler@unibas.ch>
Date: Tue, 18 Jun 2019 18:20:47 +0200
Subject: [PATCH 3/4] readme updated

---
 readme.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 1a288b9..17f188a 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-# Pollmaster V 2.3
+# Pollmaster V 2.4
 
 ## Overview
 
@@ -8,6 +8,7 @@ Here is a quick list of features:
 
 - Voting works with reactions (users don't need to type anything)
 - Anonymous voting is possible
+- You can hide the current vote count to prevent sheeping
 - Polls can be single choice, multiple choice or restricted to a specific number of choices
 - You can prepare polls in advance and schedule them to a date and time or manually activate them
 - Polls can be given a deadline or they can be open until closed manually
@@ -23,19 +24,21 @@ Here is a quick list of features:
 
 Here is how Pollmaster looks in action:
 
-![Pollmaster in action](https://i.imgur.com/vSXgd0r.png "Poll 1")
+![Pollmaster in action](https://i.imgur.com/C3zqnK2.png "Poll 1")
 
-![Pollmaster in action](https://i.imgur.com/kMbnmiJ.png "Poll 2")
+![Pollmaster in action](https://i.imgur.com/an0E3EO.png "Poll 2")
 
 ## The most important commands
 
 | Command                | Effect                                             |
 |------------------------|----------------------------------------------------|
 | pm!help                | Shows an interactive help menu                     |
-| pm!new                 | Starts a new poll with all the settings            |
+| pm!new                 | Starts a new poll with the most common settings    |
+| pm!advanced            | Starts a new poll all the settings                 |
 | pm!quick               | Starts a new poll with just a question and options |
 | pm!show <label>        | Shows poll in a specified channel (can be different from original channel) |
 | pm!prefix <new prefix> | Change the prefix for this server                  |
+| @mention prefix        | Show the prefix if you forgot it                   |
 | pm!userrole <any role> | Set the role that has the rights to use the bot    |
 
 ## Getting Started

From c2ee8db59e6505b816a27337cea034e24292c418 Mon Sep 17 00:00:00 2001
From: Matthias Nadler <matthias.nadler@unibas.ch>
Date: Tue, 18 Jun 2019 18:30:32 +0200
Subject: [PATCH 4/4] remove export, add to gitignore

---
 .gitignore                                |  3 ++
 export/444493407784665108_LameKestrel.txt | 37 -------------------
 export/444493407784665108_TameOwl.txt     | 37 -------------------
 export/444493407784665108_kaka.txt        | 37 -------------------
 export/444493407784665108_keke3.txt       | 37 -------------------
 export/444493407784665108_llll.txt        | 36 ------------------
 export/444493407784665108_okaaydude.txt   | 45 -----------------------
 export/544514197262696469_abcde.txt       | 38 -------------------
 8 files changed, 3 insertions(+), 267 deletions(-)
 delete mode 100644 export/444493407784665108_LameKestrel.txt
 delete mode 100644 export/444493407784665108_TameOwl.txt
 delete mode 100644 export/444493407784665108_kaka.txt
 delete mode 100644 export/444493407784665108_keke3.txt
 delete mode 100644 export/444493407784665108_llll.txt
 delete mode 100644 export/444493407784665108_okaaydude.txt
 delete mode 100644 export/544514197262696469_abcde.txt

diff --git a/.gitignore b/.gitignore
index c66e9d5..90a0880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ cogs/__pycache__/
 essentials/__pycache__/
 
 utils/__pycache__/
+
+# export
+export/*
diff --git a/export/444493407784665108_LameKestrel.txt b/export/444493407784665108_LameKestrel.txt
deleted file mode 100644
index 8280a71..0000000
--- a/export/444493407784665108_LameKestrel.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---------------------------------------------
-POLLMASTER DISCORD EXPORT
---------------------------------------------
-Server name (ID): VoteBotTesting (444493407784665108)
-Owner of the poll: Newti
-Time of creation: 17-Jun-2019 14:45 
---------------------------------------------
-POLL SETTINGS
---------------------------------------------
-Question / Name: asf
-Label: LameKestrel
-Anonymous: No
-# Choices: 1
-Answer options: ✅, ❎
-Allowed roles: @everyone
-Weights for roles: No weights
-Deadline: No deadline
---------------------------------------------
-POLL RESULTS
---------------------------------------------
-Number of participants: 1
-Raw results: ✅: 0, ❎: 1
-Weighted results: ✅: 0, ❎: 1
-Winning option: ❎ with 1 votes
---------------------------------------------
-DETAILED POLL RESULTS
---------------------------------------------
-Dev|Newti: ❎
---------------------------------------------
-BOT DETAILS
---------------------------------------------
-Creator: Newti#0654
-Link to invite, vote for or support Pollmaster:
-https://discordbots.org/bot/444514223075360800
---------------------------------------------
-END OF FILE
---------------------------------------------
diff --git a/export/444493407784665108_TameOwl.txt b/export/444493407784665108_TameOwl.txt
deleted file mode 100644
index 1f3b053..0000000
--- a/export/444493407784665108_TameOwl.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---------------------------------------------
-POLLMASTER DISCORD EXPORT
---------------------------------------------
-Server name (ID): VoteBotTesting (444493407784665108)
-Owner of the poll: Newti
-Time of creation: 17-Jun-2019 14:14 
---------------------------------------------
-POLL SETTINGS
---------------------------------------------
-Question / Name: Oh i forgot
-Label: TameOwl
-Anonymous: No
-# Choices: 1
-Answer options: yes, no, maybe
-Allowed roles: @everyone
-Weights for roles: No weights
-Deadline: No deadline
---------------------------------------------
-POLL RESULTS
---------------------------------------------
-Number of participants: 1
-Raw results: yes: 1, no: 0, maybe: 0
-Weighted results: yes: 1, no: 0, maybe: 0
-Winning option: yes with 1 votes
---------------------------------------------
-DETAILED POLL RESULTS
---------------------------------------------
-Dev|Newti: yes (test) 
---------------------------------------------
-BOT DETAILS
---------------------------------------------
-Creator: Newti#0654
-Link to invite, vote for or support Pollmaster:
-https://discordbots.org/bot/444514223075360800
---------------------------------------------
-END OF FILE
---------------------------------------------
diff --git a/export/444493407784665108_kaka.txt b/export/444493407784665108_kaka.txt
deleted file mode 100644
index 1e1e35b..0000000
--- a/export/444493407784665108_kaka.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---------------------------------------------
-POLLMASTER DISCORD EXPORT
---------------------------------------------
-Server name (ID): VoteBotTesting (444493407784665108)
-Owner of the poll: Newti
-Time of creation: 17-Jun-2019 15:15 
---------------------------------------------
-POLL SETTINGS
---------------------------------------------
-Question / Name: Aodjasd
-Label: kaka
-Anonymous: No
-# Choices: Multiple
-Answer options: abc, def, ghi, jkl
-Allowed roles: @everyone
-Weights for roles: No weights
-Deadline: 17-Jun-2019 15:16 GMT
---------------------------------------------
-POLL RESULTS
---------------------------------------------
-Number of participants: 1
-Raw results: abc: 1, def: 0, ghi: 1, jkl: 0
-Weighted results: abc: 1, def: 0, ghi: 1, jkl: 0
-Winning options: abc, ghi with 1 votes
---------------------------------------------
-DETAILED POLL RESULTS
---------------------------------------------
-Dev|Newti: abc, ghi (okay dude this is my textasdasd) 
---------------------------------------------
-BOT DETAILS
---------------------------------------------
-Creator: Newti#0654
-Link to invite, vote for or support Pollmaster:
-https://discordbots.org/bot/444514223075360800
---------------------------------------------
-END OF FILE
---------------------------------------------
diff --git a/export/444493407784665108_keke3.txt b/export/444493407784665108_keke3.txt
deleted file mode 100644
index 6a33235..0000000
--- a/export/444493407784665108_keke3.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---------------------------------------------
-POLLMASTER DISCORD EXPORT
---------------------------------------------
-Server name (ID): VoteBotTesting (444493407784665108)
-Owner of the poll: Newti
-Time of creation: 18-Jun-2019 11:03 
---------------------------------------------
-POLL SETTINGS
---------------------------------------------
-Question / Name: asdasd
-Label: keke3
-Anonymous: Yes
-# Choices: 3
-Answer options: asd, fgh, jkl, 121, asd
-Allowed roles: @everyone
-Weights for roles: No weights
-Deadline: 18-Jun-2019 11:04 GMT
---------------------------------------------
-POLL RESULTS
---------------------------------------------
-Number of participants: 1
-Raw results: asd: 0, fgh: 1, jkl: 1, 121: 0, asd: 1
-Weighted results: asd: 0, fgh: 1, jkl: 1, 121: 0, asd: 1
-Winning options: fgh, jkl, asd with 1 votes
---------------------------------------------
-LIST OF PARTICIPANTS
---------------------------------------------
-Dev|Newti
---------------------------------------------
-BOT DETAILS
---------------------------------------------
-Creator: Newti#0654
-Link to invite, vote for or support Pollmaster:
-https://discordbots.org/bot/444514223075360800
---------------------------------------------
-END OF FILE
---------------------------------------------
diff --git a/export/444493407784665108_llll.txt b/export/444493407784665108_llll.txt
deleted file mode 100644
index 5235aaf..0000000
--- a/export/444493407784665108_llll.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---------------------------------------------
-POLLMASTER DISCORD EXPORT
---------------------------------------------
-Server name (ID): VoteBotTesting (444493407784665108)
-Owner of the poll: Newti
-Time of creation: 12-Apr-2019 15:21 
---------------------------------------------
-POLL SETTINGS
---------------------------------------------
-Question / Name: asd
-Label: llll
-Anonymous: No
-Choices: Multiple
-Answer options: in favour, against, abstaining
-Allowed roles: @everyone
-Weights for roles: No weights
-Deadline: 12-Apr-2019 21:21 GMT
---------------------------------------------
-POLL RESULTS
---------------------------------------------
-Number of participants: 1
-Raw results: in favour: 0, against: 0, abstaining: 0
-Weighted results: in favour: 0, against: 0, abstaining: 0
-Winning options: in favour, against, abstaining with 0 votes
---------------------------------------------
-DETAILED POLL RESULTS
---------------------------------------------
---------------------------------------------
-BOT DETAILS
---------------------------------------------
-Creator: Newti#0654
-Link to invite, vote for or support Pollmaster:
-https://discordbots.org/bot/444514223075360800
---------------------------------------------
-END OF FILE
---------------------------------------------
diff --git a/export/444493407784665108_okaaydude.txt b/export/444493407784665108_okaaydude.txt
deleted file mode 100644
index 251861d..0000000
--- a/export/444493407784665108_okaaydude.txt
+++ /dev/null
@@ -1,45 +0,0 @@
---------------------------------------------
-POLLMASTER DISCORD EXPORT
---------------------------------------------
-Server name (ID): VoteBotTesting (444493407784665108)
-Owner of the poll: Newti
-Time of creation: 17-Jun-2019 14:40 
---------------------------------------------
-POLL SETTINGS
---------------------------------------------
-Question / Name: Andasd
-Label: okaaydude
-Anonymous: Yes
-# Choices: Multiple
-Answer options: abcd, efg, hji, asd
-Allowed roles: @everyone
-Weights for roles: No weights
-Deadline: 17-Jun-2019 14:50 GMT
---------------------------------------------
-POLL RESULTS
---------------------------------------------
-Number of participants: 1
-Raw results: abcd: 1, efg: 0, hji: 1, asd: 1
-Weighted results: abcd: 1, efg: 0, hji: 1, asd: 1
-Winning options: abcd, hji, asd with 1 votes
---------------------------------------------
-LIST OF PARTICIPANTS
---------------------------------------------
-Dev|Newti
---------------------------------------------
-CUSTOM ANSWERS (RANDOM ORDER)
---------------------------------------------
-abcd:
-test
-
-asd:
-No Answer
---------------------------------------------
-BOT DETAILS
---------------------------------------------
-Creator: Newti#0654
-Link to invite, vote for or support Pollmaster:
-https://discordbots.org/bot/444514223075360800
---------------------------------------------
-END OF FILE
---------------------------------------------
diff --git a/export/544514197262696469_abcde.txt b/export/544514197262696469_abcde.txt
deleted file mode 100644
index 7fb1995..0000000
--- a/export/544514197262696469_abcde.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---------------------------------------------
-POLLMASTER DISCORD EXPORT
---------------------------------------------
-Server name (ID): Pollmaster HQ (544514197262696469)
-Owner of the poll: Newti
-Time of creation: 24-Apr-2019 07:51 
---------------------------------------------
-POLL SETTINGS
---------------------------------------------
-Question / Name: Abcde
-Label: abcde
-Anonymous: No
-# Choices: Multiple
-Answer options: abc, def, ghi, jkl
-Allowed roles: @everyone
-Weights for roles: No weights
-Deadline: 24-Apr-2019 08:51 GMT
---------------------------------------------
-POLL RESULTS
---------------------------------------------
-Number of participants: 2
-Raw results: abc: 2, def: 2, ghi: 1, jkl: 1
-Weighted results: abc: 2, def: 2, ghi: 1, jkl: 1
-Winning options: abc, def with 2 votes
---------------------------------------------
-DETAILED POLL RESULTS
---------------------------------------------
-Newti: abc, def, ghi, jkl
-Page of the Reach: abc, def
---------------------------------------------
-BOT DETAILS
---------------------------------------------
-Creator: Newti#0654
-Link to invite, vote for or support Pollmaster:
-https://discordbots.org/bot/444514223075360800
---------------------------------------------
-END OF FILE
---------------------------------------------