hendrik/pollmaster-docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed help message

Browse Source 
userid to string for votes
This commit is contained in:
Matthias Nadler 2019-04-12 20:49:09 +02:00
parent dae2a6e494
commit 734546bb00
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -6,3 +6,11 @@ venv/
# Tokens and Passwwords # Tokens and Passwwords
essentials/secrets\.py essentials/secrets\.py
pollmaster\.log
cogs/__pycache__/
essentials/__pycache__/
utils/__pycache__/

15
cogs/poll_controls.py
View File

@ -475,8 +475,7 @@ class PollControls(commands.Cog):
if result and result.get('admin_role') not in [r.name for r in member.roles] and result.get( 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]: 'user_role') not in [r.name for r in member.roles]:
pre = await get_server_pre(self.bot, server) pre = await get_server_pre(self.bot, server)
await self.bot.send_message(ctx.message.author, await ctx.message.author.send('You don\'t have sufficient rights to start new polls on this server. '
'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. ' '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 ' f'To view and set the permissions, an admin can use `{pre}userrole` and '
f'`{pre}adminrole`') f'`{pre}adminrole`')
@ -692,9 +691,9 @@ class PollControls(commands.Cog):
# choices # choices
choices = 'You have not voted yet.' if vote_rights else 'You can\'t vote in this poll.' choices = 'You have not voted yet.' if vote_rights else 'You can\'t vote in this poll.'
if user.id in p.votes: if str(user.id) in p.votes:
if p.votes[user.id]['choices'].__len__() > 0: if p.votes[str(user.id)]['choices'].__len__() > 0:
choices = ', '.join([p.options_reaction[c] for c in p.votes[user.id]['choices']]) choices = ', '.join([p.options_reaction[c] for c in p.votes[str(user.id)]['choices']])
embed.add_field( embed.add_field(
name=f'{"Your current votes (can be changed as long as the poll is open):" if is_open else "Your final votes:"}', name=f'{"Your current votes (can be changed as long as the poll is open):" if is_open else "Your final votes:"}',
value=choices, inline=False) value=choices, inline=False)
@ -736,15 +735,15 @@ class PollControls(commands.Cog):
c = 0 c = 0
for user_id in p.votes: for user_id in p.votes:
member = server.get_member(user_id) member = server.get_member(user_id)
if not member or i not in p.votes[user_id]['choices']: if not member or i not in p.votes[str(user_id)]['choices']:
continue continue
c += 1 c += 1
name = member.nick name = member.nick
if not name: if not name:
name = member.name name = member.name
msg += f'\n{name}' msg += f'\n{name}'
if p.votes[user_id]['weight'] != 1: if p.votes[str(user_id)]['weight'] != 1:
msg += f' (weight: {p.votes[user_id]["weight"]})' 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']]) # msg += ': ' + ', '.join([AZ_EMOJIS[c]+" "+p.options_reaction[c] for c in p.votes[user_id]['choices']])
if msg.__len__() > 1500: if msg.__len__() > 1500:
await user.send(msg) await user.send(msg)