Merge branch 'master' of http://git.nr18.space/berhsi/jabberbot

mal wieder versucht zu pushen ohne vorher zu pullen

idlebot.py

@@ -57,10 +57,10 @@ class IdleBot(slixmpp.ClientXMPP):
             room -- The room to join.
         '''
         self.plugin['xep_0045'].join_muc(room,
-                                         self.nick,
+                                         self.nick) # ,
                                          # If a room password is needed, use:
                                          # password=the_room_password,
-                                         wait=True)
+                                         # wait=True)
         logging.info('Joined room {}'.format(room))
         self.room_roster[room] = []
 
@@ -89,7 +89,7 @@ class IdleBot(slixmpp.ClientXMPP):
             self.send_message(mto = room,
                               mbody = greeting,
                               mtype = 'groupchat')
-        
+
     def muc_offline(self, presence):
         """
         Process a presence stanza from a chat room. At first we look
@@ -114,7 +114,7 @@ class IdleBot(slixmpp.ClientXMPP):
             if nick in self.room_roster[room]:
                 self.room_roster[room].remove(nick)
         logging.debug('Roster: {}'.format(self.room_roster))
-                
+
     def reconnect(self, event):
         '''
         Deals with alls events for disconnections. Tryes to reconnect.