comparison libervia/backend/plugins/plugin_xep_0045.py @ 4117:d861ad696797

plugin XEP-0045: fix name conflict in errback
author Goffi <goffi@goffi.org>
date Tue, 03 Oct 2023 15:03:53 +0200
parents 2ea567afc0cf
children 453e53dfc50e
comparison
equal deleted inserted replaced
4116:23fa52acf72c 4117:d861ad696797
517 517
518 @return: unicode 518 @return: unicode
519 """ 519 """
520 return self.host.memory.config_get(CONFIG_SECTION, 'default_muc', default_conf['default_muc']) 520 return self.host.memory.config_get(CONFIG_SECTION, 'default_muc', default_conf['default_muc'])
521 521
522 def _join_eb(self, failure_, client): 522 def _bridge_join_eb(self, failure_, client):
523 failure_.trap(AlreadyJoined) 523 failure_.trap(AlreadyJoined)
524 room = failure_.value.room 524 room = failure_.value.room
525 return [True] + self._get_room_joined_args(room, client.profile) 525 return [True] + self._get_room_joined_args(room, client.profile)
526 526
527 def _join(self, room_jid_s, nick, options, profile_key=C.PROF_KEY_NONE): 527 def _join(self, room_jid_s, nick, options, profile_key=C.PROF_KEY_NONE):
546 d = defer.ensureDeferred( 546 d = defer.ensureDeferred(
547 self.join(client, room_jid, nick, options or None) 547 self.join(client, room_jid, nick, options or None)
548 ) 548 )
549 549
550 d.addCallback(lambda room: [False] + self._get_room_joined_args(room, client.profile)) 550 d.addCallback(lambda room: [False] + self._get_room_joined_args(room, client.profile))
551 d.addErrback(self._join_eb, client) 551 d.addErrback(self._bridge_join_eb, client)
552 return d 552 return d
553 553
554 async def join( 554 async def join(
555 self, 555 self,
556 client: SatXMPPEntity, 556 client: SatXMPPEntity,