url = "http://msn-transport.jabberstudio.org"
-version = "0.11-dev" # The transport version
+version = "0.11.1" # The transport version
mangle = True # XDB '@' -> '%' mangling
id = "msn" # The transport identifier
def reloadConfig():
msn.MSNConnection.GETALLAVATARS = config.getAllAvatars
+ msn.setDebug(config._debugLevel >= 4)
def isGroupJID(jid):
""" Returns True if the JID passed is a valid groupchat JID (for MSN, does not contain '%') """
else:
if msnid.startswith("tel:+"):
msnid = msnid.replace("tel:+", "") + "%tel"
- jid = msnid.replace('@', '%') + "@" + config.jid + (withResource and "/msn" or "")
+ jid = msnid.replace('@', '%') + "@" + config.jid
msn2jid_cache[msnid] = jid
jid2msn_cache[jid] = msnid
- return jid
+ return msn2jid(msnid, withResource)
# Marks this as the function to be used in jabber:iq:gateway (Service ID Translation)
def translateAccount(msnid):
def __init__(self, session):
self.jabberID = session.jabberID
self.session = session
- self.subscriptionBuffer = []
def removeMe(self):
- self.subscriptionBuffer = None
self.session = None
def addContact(self, jid):
# Handle adding a contact that has previously been removed
msnContact = self.session.legacycon.getContacts().getContact(userHandle)
- if msnContact.lists & msn.REVERSE_LIST:
+ if msnContact and msnContact.lists & msn.REVERSE_LIST:
self.session.legacycon.contactAddedMe(userHandle)
self.authContact(jid)
self.session.contactList.getContact(jid).contactGrantsAuth()