Mercurial > libervia-backend

diff src/plugins/plugin_xep_0045.py @ 2028:70bd7b242a9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
plugin XEP-0045: fixed options parameter handling in bridge callback
author Goffi <goffi@goffi.org>
date Mon, 08 Aug 2016 00:50:01 +0200
parents 6c51e8f17c92
children b99bd02ea643
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0045.py	Mon Aug 08 00:49:17 2016 +0200
+++ b/src/plugins/plugin_xep_0045.py	Mon Aug 08 00:50:01 2016 +0200
@@ -388,7 +388,7 @@
         """
         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 @@
         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):