X-Git-Url: https://code.delx.au/pymsnt/blobdiff_plain/c4a69377f28b46025f8ee9d4500c44e598df644a..HEAD:/src/legacy/glue.py diff --git a/src/legacy/glue.py b/src/legacy/glue.py index ff56545..cc3b30c 100644 --- a/src/legacy/glue.py +++ b/src/legacy/glue.py @@ -2,11 +2,11 @@ # Licensed for distribution under the GPL version 2, check COPYING for details import os.path -import utils -from twisted.internet import task -from tlib.xmlw import Element -from tlib import msn +from twisted.internet import task, error +from twisted.words.xish.domish import Element + from debug import LogEvent, INFO, WARN, ERROR +from legacy import msn import disco import groupchat import ft @@ -17,9 +17,8 @@ import lang -name = "MSN Transport" # The name of the transport -url = "http://msn-transport.jabberstudio.org" -version = "0.11-dev" # The transport version +url = "http://delx.net.au/projects/pymsnt" +version = "0.11.3" # The transport version mangle = True # XDB '@' -> '%' mangling id = "msn" # The transport identifier @@ -37,6 +36,8 @@ defaultAvatar = avatar.AvatarCache().setAvatar(defaultAvatarData) def reloadConfig(): msn.MSNConnection.GETALLAVATARS = config.getAllAvatars + msn.MSNConnection.BINDADDRESS = config.host + msn.setDebug(config._debugLevel >= 4) def isGroupJID(jid): """ Returns True if the JID passed is a valid groupchat JID (for MSN, does not contain '%') """ @@ -95,16 +96,45 @@ def updateStats(statistics): #stats["FailedAvatarCount"] = msnp2p.MSNP2P_Avatar.ERROR_COUNT +msn2jid_cache = {} def msn2jid(msnid, withResource): """ Converts a MSN passport into a JID representation to be used with the transport """ - return msnid.replace('@', '%') + "@" + config.jid + (withResource and "/msn" or "") + global msn2jid_cache + global jid2msn_cache + + if msn2jid_cache.has_key(msnid): + jid = msn2jid_cache[msnid] + if withResource: + jid += "/msn" + return jid + else: + if msnid.startswith("tel:+"): + msnid = msnid.replace("tel:+", "") + "%tel" + jid = msnid.replace('@', '%') + "@" + config.jid + msn2jid_cache[msnid] = jid + jid2msn_cache[jid] = msnid + return msn2jid(msnid, withResource) # Marks this as the function to be used in jabber:iq:gateway (Service ID Translation) -translateAccount = lambda a: msn2jid(a, False) +def translateAccount(msnid): + return msn2jid(msnid, False) +jid2msn_cache = {} def jid2msn(jid): """ Converts a JID representation of a MSN passport into the original MSN passport """ - return unicode(jid[:jid.find('@')].replace('%', '@')).split("/")[0] + global jid2msn_cache + global msn2jid_cache + + if jid2msn_cache.has_key(jid): + msnid = jid2msn_cache[jid] + return msnid + else: + if jid.find("%tel@") > 0: + jid = "tel:+" + jid.replace("%tel@", "@") + msnid = unicode(jid[:jid.find('@')].replace('%', '@')).split("/")[0] + jid2msn_cache[jid] = msnid + msn2jid_cache[msnid] = jid + return msnid def presence2state(show, ptype): @@ -117,6 +147,7 @@ def presence2state(show, ptype): return msn.STATUS_BUSY elif show == "away" or show == "xa": return msn.STATUS_AWAY + return msn.STATUS_ONLINE def state2presence(state): @@ -306,9 +337,9 @@ class LegacyConnection(msn.MSNConnection): global defaultJabberAvatarData if av: - msn.MSNConnection.changeAvatar(self, av.getImageData()) + msn.MSNConnection.changeAvatar(self, av.getImageData) else: - msn.MSNConnection.changeAvatar(self, defaultJabberAvatarData) + msn.MSNConnection.changeAvatar(self, lambda: defaultJabberAvatarData) def sendTypingNotifications(self): if not self.session: return @@ -349,8 +380,9 @@ class LegacyConnection(msn.MSNConnection): def connectionLost(self, reason): LogEvent(INFO, self.jabberID) - text = lang.get(self.session.lang).msnDisconnected % reason - self.session.sendMessage(to=self.jabberID, fro=config.jid, body=text) + if reason.type != error.ConnectionDone: + text = lang.get(self.session.lang).msnDisconnected % reason + self.session.sendMessage(to=self.jabberID, fro=config.jid, body=text) self.session.removeMe() # Tear down the session def multipleLogin(self): @@ -374,13 +406,13 @@ class LegacyConnection(msn.MSNConnection): def loggedIn(self): LogEvent(INFO, self.jabberID) - self.session.ready = True def listSynchronized(self): LogEvent(INFO, self.jabberID) self.session.sendPresence(to=self.jabberID, fro=config.jid) self.legacyList.syncJabberLegacyLists() self.listSynced = True + self.session.ready = True #self.legacyList.flushSubscriptionBuffer() def ourStatusChanged(self, statusCode, screenName, personal): @@ -452,8 +484,8 @@ class LegacyConnection(msn.MSNConnection): if not (c and msnContact): return show, ptype = state2presence(msnContact.status) - status = msnContact.personal.decode("utf-8") - screenName = msnContact.screenName.decode("utf-8") + status = msnContact.personal.decode("utf-8", "replace") + screenName = msnContact.screenName.decode("utf-8", "replace") c.updateNickname(screenName, push=False) c.updatePresence(show, status, ptype, force=True) @@ -521,16 +553,20 @@ class LegacyList: 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): LogEvent(INFO, self.jabberID) userHandle = jid2msn(jid) self.session.legacycon.addContact(msn.FORWARD_LIST, userHandle) + + # Handle adding a contact that has previously been removed + msnContact = self.session.legacycon.getContacts().getContact(userHandle) + if msnContact and msnContact.lists & msn.REVERSE_LIST: + self.session.legacycon.contactAddedMe(userHandle) + self.authContact(jid) self.session.contactList.getContact(jid).contactGrantsAuth() def removeContact(self, jid): @@ -541,17 +577,18 @@ class LegacyList: def authContact(self, jid): LogEvent(INFO, self.jabberID) - jid = jid2msn(jid) - d = self.session.legacycon.remContact(msn.PENDING_LIST, jid) + userHandle = jid2msn(jid) + d = self.session.legacycon.remContact(msn.PENDING_LIST, userHandle) if d: - self.session.legacycon.addContact(msn.REVERSE_LIST, jid) - self.session.legacycon.remContact(msn.BLOCK_LIST, jid) - self.session.legacycon.addContact(msn.ALLOW_LIST, jid) + self.session.legacycon.addContact(msn.REVERSE_LIST, userHandle) + self.session.legacycon.remContact(msn.BLOCK_LIST, userHandle) + self.session.legacycon.addContact(msn.ALLOW_LIST, userHandle) def deauthContact(self, jid): LogEvent(INFO, self.jabberID) jid = jid2msn(jid) self.session.legacycon.remContact(msn.ALLOW_LIST, jid) + self.session.legacycon.remContact(msn.PENDING_LIST, jid) self.session.legacycon.addContact(msn.BLOCK_LIST, jid)