libervia-backend: sat/plugins/plugin_xep

comparison sat/plugins/plugin_xep_0249.py @ 3002:6acaa8244220

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

author	Goffi <goffi@goffi.org>
date	Sun, 14 Jul 2019 11:23:25 +0200
parents	003b8b4b56a7
children	ab2696e34d29

comparison

equal deleted inserted replaced

-:ce52ac2fe213
+:6acaa8244220
 from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
 from wokkel.subprotocols import XMPPHandler
 MESSAGE = "/message"
-NS_DIRECT_MUC_INVITATION = "jabber:x:conference"
+NS_X_CONFERENCE = "jabber:x:conference"
-DIRECT_MUC_INVITATION_REQUEST = MESSAGE + '/x[@xmlns="' + NS_DIRECT_MUC_INVITATION + '"]'
 AUTOJOIN_KEY = "Misc"
 AUTOJOIN_NAME = "Auto-join MUC on invitation"
 AUTOJOIN_VALUES = ["ask", "always", "never"]
 PLUGIN_INFO = {
 )
 try:
 self.host.plugins[C.TEXT_CMDS].registerTextCommands(self)
 except KeyError:
 log.info(_("Text commands not available"))
+host.registerNamespace('x-conference', NS_X_CONFERENCE)
+host.trigger.add("MessageReceived", self._MessageReceivedTrigger)
 def getHandler(self, client):
-return XEP_0249_handler(self)
+return XEP_0249_handler()
 def _invite(self, guest_jid_s, room_jid_s, options, profile_key):
 """Invite an user to a room
 @param guest_jid_s: jid of the user to invite
 @param room(jid.JID): jid of the room where the user is invited
 @param options(dict): attribute with extra info (reason, password) as in #XEP-0249
 """
 message = domish.Element((None, "message"))
 message["to"] = guest.full()
-x_elt = message.addElement((NS_DIRECT_MUC_INVITATION, "x"))
+x_elt = message.addElement((NS_X_CONFERENCE, "x"))
 x_elt["jid"] = room.userhost()
 for key, value in options.iteritems():
 if key not in ("password", "reason", "thread"):
 log.warning(u"Ignoring invalid invite option: {}".format(key))
 continue
 % {"room": room_jid.userhost(), "profile": client.profile}
 )
 d = self.host.plugins["XEP-0045"].join(client, room_jid, client.jid.user, {})
 return d
-def onInvitation(self, message, profile):
+def _MessageReceivedTrigger(self, client, message_elt, post_treat):
-"""
+"""Check if a direct invitation is in the message, and handle it"""
-called when an invitation is received
+x_elt = next(message_elt.elements(NS_X_CONFERENCE, 'x'), None)
-@param message: message element
+if x_elt is None:
-@profile: %(doc_profile)s
+return True
-"""
-client = self.host.getClient(profile)
+try:
-try:
+room_jid_s = x_elt[u"jid"]
-room_jid_s = message.firstChildElement()["jid"]
+except KeyError:
-log.info(
+log.warning(_(u"invalid invitation received: {xml}").format(
-_(u"Invitation received for room %(room)s [%(profile)s]")
+xml=message_elt.toXml()))
-% {"room": room_jid_s, "profile": profile}
+return False
-)
+log.info(
-except:
+_(u"Invitation received for room %(room)s [%(profile)s]")
-log.error(_("Error while parsing invitation"))
+% {"room": room_jid_s, "profile": client.profile}
-return
+)
-from_jid_s = message["from"]
+from_jid_s = message_elt["from"]
 room_jid = jid.JID(room_jid_s)
 try:
 self.host.plugins["XEP-0045"].checkRoomJoined(client, room_jid)
 except exceptions.NotFound:
 pass
 _(u"Invitation silently discarded because user is already in the room.")
 )
 return
 autojoin = self.host.memory.getParamA(
-AUTOJOIN_NAME, AUTOJOIN_KEY, profile_key=profile
+AUTOJOIN_NAME, AUTOJOIN_KEY, profile_key=client.profile
 )
 if autojoin == "always":
-self._accept(room_jid, profile)
+self._accept(room_jid, client.profile)
 elif autojoin == "never":
 msg = D_(
-"An invitation from %(user)s to join the room %(room)s has been declined according to your personal settings."
+u"An invitation from %(user)s to join the room %(room)s has been "
+u"declined according to your personal settings."
 ) % {"user": from_jid_s, "room": room_jid_s}
 title = D_("MUC invitation")
 xml_tools.quickNote(self.host, client, msg, title, C.XMLUI_DATA_LVL_INFO)
 else:  # leave the default value here
 confirm_msg = D_(
-"You have been invited by %(user)s to join the room %(room)s. Do you accept?"
+u"You have been invited by %(user)s to join the room %(room)s. "
+u"Do you accept?"
 ) % {"user": from_jid_s, "room": room_jid_s}
 confirm_title = D_("MUC invitation")
 d = xml_tools.deferConfirm(
-self.host, confirm_msg, confirm_title, profile=profile
+self.host, confirm_msg, confirm_title, profile=client.profile
 )
 def accept_cb(accepted):
 if accepted:
-self._accept(room_jid, profile)
+self._accept(room_jid, client.profile)
 d.addCallback(accept_cb)
+return False
 def cmd_invite(self, client, mess_data):
 """invite someone in the room
 @command (group): JID
 my_host = client.jid.host
 try:
 contact_jid = jid.JID(contact_jid_s)
 except (RuntimeError, jid.InvalidFormat, AttributeError):
 feedback = _(
-u"You must provide a valid JID to invite, like in '/invite contact@{host}'"
+u"You must provide a valid JID to invite, like in '/invite "
+u"contact@{host}'"
 ).format(host=my_host)
 self.host.plugins[C.TEXT_CMDS].feedBack(client, feedback, mess_data)
 return False
 if not contact_jid.user:
 contact_jid.user, contact_jid.host = contact_jid.host, my_host
 class XEP_0249_handler(XMPPHandler):
 implements(iwokkel.IDisco)
-def __init__(self, plugin_parent):
-self.plugin_parent = plugin_parent
-self.host = plugin_parent.host
-def connectionInitialized(self):
-self.xmlstream.addObserver(
-DIRECT_MUC_INVITATION_REQUEST,
-self.plugin_parent.onInvitation,
-profile=self.parent.profile,
-)
 def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
-return [disco.DiscoFeature(NS_DIRECT_MUC_INVITATION)]
+return [disco.DiscoFeature(NS_X_CONFERENCE)]
 def getDiscoItems(self, requestor, target, nodeIdentifier=""):
 return []

Mercurial > libervia-backend

comparison sat/plugins/plugin_xep_0249.py @ 3002:6acaa8244220