# Licensed for distribution under the GPL version 2, check COPYING for details
import utils
-from tlib.xmlw import Element, jid
+from twisted.words.xish.domish import Element
+from twisted.words.protocols.jabber.jid import internJID
from debug import LogEvent, INFO, WARN, ERROR
import disco
# Strip the resource off any presence subscribes (as per XMPP RFC 3921 Section 5.1.6)
# Makes eJabberd behave :)
if ptype in ("subscribe", "subscribed", "unsubscribe", "unsubscribed"):
- to = jid.intern(to).userhost()
- fro = jid.intern(fro).userhost()
+ to = internJID(to).userhost()
+ fro = internJID(fro).userhost()
el = Element((None, "presence"))
el.attributes["to"] = to
fro = el.getAttribute("from")
to = el.getAttribute("to")
try:
- froj = jid.intern(fro)
- toj = jid.intern(to)
+ froj = internJID(fro)
+ toj = internJID(to)
except Exception, e:
LogEvent(WARN, self.jabberID)
return
""" Handles incoming presence packets """
#LogEvent(INFO, self.jabberID)
fro = el.getAttribute("from")
- froj = jid.intern(fro)
+ froj = internJID(fro)
to = el.getAttribute("to")
- toj = jid.intern(to)
+ toj = internJID(to)
# Grab the contents of the <presence/> packet
ptype = el.getAttribute("type")