summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-10-05 21:44:33 +0200
committermathieui <mathieui@mathieui.net>2015-10-05 21:44:33 +0200
commit11d41625e2eaa70905a2398496fb02d886961d4b (patch)
tree5cc340530913e3750b2f8deffa7b718847c0b007 /src/core
parent62491a4caad2565ab81b62eedf053569976cbfe1 (diff)
downloadpoezio-11d41625e2eaa70905a2398496fb02d886961d4b.tar.gz
poezio-11d41625e2eaa70905a2398496fb02d886961d4b.tar.bz2
poezio-11d41625e2eaa70905a2398496fb02d886961d4b.tar.xz
poezio-11d41625e2eaa70905a2398496fb02d886961d4b.zip
Get rid of the muc_history_length option
It hasn’t worked for more than two years and no one complained. Furthermore, poezio tries to be smart and request messages based on previous activity, and not raw numbers.
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)