plugin XEP-0045: fix name conflict in errback
This commit is contained in:
parent
d60b79b18f
commit
29f70b35e2
1 changed files with 2 additions and 2 deletions
|
|
@ -519,7 +519,7 @@ class XEP_0045(object):
|
|||
"""
|
||||
return self.host.memory.config_get(CONFIG_SECTION, 'default_muc', default_conf['default_muc'])
|
||||
|
||||
def _join_eb(self, failure_, client):
|
||||
def _bridge_join_eb(self, failure_, client):
|
||||
failure_.trap(AlreadyJoined)
|
||||
room = failure_.value.room
|
||||
return [True] + self._get_room_joined_args(room, client.profile)
|
||||
|
|
@ -548,7 +548,7 @@ class XEP_0045(object):
|
|||
)
|
||||
|
||||
d.addCallback(lambda room: [False] + self._get_room_joined_args(room, client.profile))
|
||||
d.addErrback(self._join_eb, client)
|
||||
d.addErrback(self._bridge_join_eb, client)
|
||||
return d
|
||||
|
||||
async def join(
|
||||
|
|
|
|||
Loading…
Reference in a new issue