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

Bug fixes

Browse Source 
on join was missing and fixed member nullpointer for export
This commit is contained in:
Matthias Nadler 2019-04-12 21:39:32 +02:00
parent 237b59a587
commit a81cd34121
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cogs/poll.py
View File

@ -786,9 +786,13 @@ class Poll:
for user_id in self.votes: for user_id in self.votes:
member = self.server.get_member(user_id) member = self.server.get_member(user_id)
if self.votes[str(member.id)]['choices'].__len__() == 0: if member and self.votes[str(member.id)]['choices'].__len__() == 0:
continue continue
name = member.nick if not member:
name = "<Deleted User>"
else:
name = member.nick
if not name: if not name:
name = member.name name = member.name
export += f'\n{name}' export += f'\n{name}'
@ -803,9 +807,12 @@ class Poll:
for user_id in self.votes: for user_id in self.votes:
member = self.server.get_member(user_id) member = self.server.get_member(user_id)
if self.votes[str(user_id)]['choices'].__len__() == 0: if member and self.votes[str(user_id)]['choices'].__len__() == 0:
continue continue
name = member.nick if not member:
name = "<Deleted User>"
else:
name = member.nick
if not name: if not name:
name = member.name name = member.name
export += f'\n{name}' export += f'\n{name}'

11
pollmaster.py
View File

@ -117,4 +117,15 @@ async def on_command_error(ctx, e):
# if SETTINGS.mode == 'development': # if SETTINGS.mode == 'development':
raise e raise e
@bot.event
async def on_server_join(server):
result = await bot.db.config.find_one({'_id': str(server.id)})
if result is None:
await bot.db.config.update_one(
{'_id': str(server.id)},
{'$set': {'prefix': 'pm!', 'admin_role': 'polladmin', 'user_role': 'polluser'}},
upsert=True
)
bot.pre[str(server.id)] = 'pm!'
bot.run(SETTINGS.bot_token) bot.run(SETTINGS.bot_token)