erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin XEP-0045: fixed options parameter handling in bridge callback

Browse source
This commit is contained in:
Goffi 2016-08-08 00:50:01 +02:00
commit ae50946479
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/plugin_xep_0045.py
View file

@ -388,7 +388,7 @@ class XEP_0045(object):
"""
return self.host.memory.getConfig(CONFIG_SECTION, 'default_muc', default_conf['default_muc'])
def _join(self, room_jid_s, nick, options=None, profile_key=C.PROF_KEY_NONE):
def _join(self, room_jid_s, nick, options, profile_key=C.PROF_KEY_NONE):
"""join method used by bridge
@return: unicode (the room bare)
@ -405,7 +405,7 @@ class XEP_0045(object):
else:
room_jid = self.getUniqueName(profile_key=client.profile)
# TODO: error management + signal in bridge
d = self.join(client, room_jid, nick, options)
d = self.join(client, room_jid, nick, options or None)
return d.addCallback(lambda room: room.roomJID.userhost())
def join(self, client, room_jid, nick=None, options=None):