Use the password stored in the MucTab, with /join, if none is found otherwise

This commit is contained in:
Florent Le Coz 2015-06-01 13:49:19 +02:00
parent ab3c382709
commit 8f75e10d2f

View file

@ -387,13 +387,18 @@ def command_join(self, args, histo_length=None):
seconds = int(seconds) seconds = int(seconds)
else: else:
seconds = 0 seconds = 0
if password: # If we didnt have a password by now (from a bookmark or the
tab.password = password # explicit argument), just use the password that is stored in the
# tab because of our last join
if not password:
password = tab.password
muc.join_groupchat(self, room, nick, password, muc.join_groupchat(self, room, nick, password,
histo_length, histo_length,
current_status.message, current_status.message,
current_status.show, current_status.show,
seconds=seconds) seconds=seconds)
# Store in the tab the password we used, for later use
tab.password = password
if not tab: if not tab:
self.open_new_room(room, nick, password=password) self.open_new_room(room, nick, password=password)
muc.join_groupchat(self, room, nick, password, muc.join_groupchat(self, room, nick, password,