From a81cd34121fb2983e3851ef951071323f8e8030f Mon Sep 17 00:00:00 2001
From: Matthias Nadler <matthias.nadler@unibas.ch>
Date: Fri, 12 Apr 2019 21:39:32 +0200
Subject: [PATCH] Bug fixes

on join was missing and fixed member nullpointer for export
---
 cogs/poll.py  | 15 +++++++++++----
 pollmaster.py | 11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/cogs/poll.py b/cogs/poll.py
index 3932477..e49b205 100644
--- a/cogs/poll.py
+++ b/cogs/poll.py
@@ -786,9 +786,13 @@ class Poll:
 
             for user_id in self.votes:
                 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
-                name = member.nick
+                if not member:
+                    name = "<Deleted User>"
+                else:
+                    name = member.nick
+
                 if not name:
                     name = member.name
                 export += f'\n{name}'
@@ -803,9 +807,12 @@ class Poll:
 
             for user_id in self.votes:
                 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
-                name = member.nick
+                if not member:
+                    name = "<Deleted User>"
+                else:
+                    name = member.nick
                 if not name:
                     name = member.name
                 export += f'\n{name}'
diff --git a/pollmaster.py b/pollmaster.py
index 8d1070f..8af135d 100644
--- a/pollmaster.py
+++ b/pollmaster.py
@@ -117,4 +117,15 @@ async def on_command_error(ctx, e):
         # if SETTINGS.mode == 'development':
         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)
\ No newline at end of file