added muc_history_length support

Author: johannesk

data/default_config.cfg

@@ -172,7 +172,7 @@ alternative_nickname =
 # Limit the number of messages you want to receive when the
 # multiuserchat rooms send you recent history
 # 0: You won't receive any
-# -1: You will receive the maximum
+# -1: You will receive the server default
 # n: You will receive at most n messages
 muc_history_length = 50
 

src/core.py

@@ -1476,6 +1476,12 @@ def command_join(self, arg, histo_length=None):
         if room.startswith('@'):
             room = room[1:]
         current_status = self.get_status()
+        if not histo_length:
+            histo_length= config.get('muc_history_length', 20)
+            if histo_length == -1:
+                histo_length= None
+        if histo_length:
+            histo_length= str(histo_length)
         if tab and not tab.joined:
             seconds = (int(time.time()) - tab.last_connection) if tab.last_connection != 0 else 0
             muc.join_groupchat(self.xmpp, room, nick, password,
@@ -2539,7 +2545,12 @@ def on_session_start(self, event):
                 self.open_new_room(bm.jid, bm.nick, False)
             nick = bm.nick if bm.nick else self.own_nick
             self.initial_joins.append(bm.jid)
-            muc.join_groupchat(self.xmpp, bm.jid, nick)
+            histo_length= config.get('muc_history_length', 20)
+            if histo_length == -1:
+                histo_length= None
+            if histo_length:
+                histo_length= str(histo_length)
+            muc.join_groupchat(self.xmpp, bm.jid, nick, None, histo_length)
 
     ### Other handlers ###