summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/commands.py8
-rw-r--r--src/core/handlers.py6
2 files changed, 1 insertions, 13 deletions
diff --git a/src/core/commands.py b/src/core/commands.py
index 256668d6..33e2e9df 100644
--- a/src/core/commands.py
+++ b/src/core/commands.py
@@ -308,7 +308,7 @@ def command_version(self, args):
fixes.get_version(self.xmpp, jid, callback=callback)
@command_args_parser.quoted(0, 2)
-def command_join(self, args, histo_length=None):
+def command_join(self, args):
"""
/join [room][/nick] [password]
"""
@@ -366,12 +366,6 @@ def command_join(self, args, histo_length=None):
if room.startswith('@'):
room = room[1:]
- if not histo_length:
- histo_length = config.get('muc_history_length')
- if histo_length == -1:
- histo_length = None
- if histo_length is not None:
- histo_length = str(histo_length)
if len(args) == 2: # a password is provided
password = args[1]
if password is None: # try to use a saved password
diff --git a/src/core/handlers.py b/src/core/handlers.py
index e17476a4..78dba635 100644
--- a/src/core/handlers.py
+++ b/src/core/handlers.py
@@ -56,17 +56,11 @@ def _join_initial_rooms(self, bookmarks):
self.open_new_room(bm.jid, nick, focus=False,
password=bm.password)
self.initial_joins.append(bm.jid)
- histo_length = config.get('muc_history_length')
- if histo_length == -1:
- histo_length = None
- if histo_length is not None:
- histo_length = str(histo_length)
# do not join rooms that do not have autojoin
# but display them anyway
if bm.autojoin:
muc.join_groupchat(self, bm.jid, nick,
passwd=bm.password,
- maxhistory=histo_length,
status=self.status.message,
show=self.status.show)