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 0249: fixed invitation handling + some improvments:

Browse source 
- properly retrieve payload by namespace
- now use a trigger instead of observer, so the message workflow is stopped if an invitation is found
- namespace is registered

fix 241
This commit is contained in:
Goffi 2019-07-14 11:23:25 +02:00
commit 692a5b34fc
1 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sat/plugins/plugin_xep_0045.py
View file

@ -482,13 +482,19 @@ class XEP_0045(object):
options = {}
if room_jid in client._muc_client.joined_rooms:
room = client._muc_client.joined_rooms[room_jid]
log.info(_(u'{profile} is already in room {room_jid}').format(profile=client.profile, room_jid = room_jid.userhost()))
log.info(_(u'{profile} is already in room {room_jid}').format(
profile=client.profile, room_jid = room_jid.userhost()))
return defer.fail(AlreadyJoined(room))
log.info(_(u"[{profile}] is joining room {room} with nick {nick}").format(profile=client.profile, room=room_jid.userhost(), nick=nick))
log.info(_(u"[{profile}] is joining room {room} with nick {nick}").format(
profile=client.profile, room=room_jid.userhost(), nick=nick))
password = options.get("password")
return client._muc_client.join(room_jid, nick, password).addCallbacks(self._joinCb, self._joinEb, (client, room_jid, nick), errbackArgs=(client, room_jid, nick, password))
d = client._muc_client.join(room_jid, nick, password)
d.addCallbacks(self._joinCb, self._joinEb,
(client, room_jid, nick),
errbackArgs=(client, room_jid, nick, password))
return d
def _nick(self, room_jid_s, nick, profile_key=C.PROF_KEY_NONE):
client = self.host.getClient(profile_key)