From 0d1ee2592602e2580e1870a834f1e185d86ec58f Mon Sep 17 00:00:00 2001 From: jamesbunton Date: Sun, 16 Apr 2006 12:06:29 +0000 Subject: [PATCH] Sensible messages are now sent to both participants if a file is rejected for being too large. git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@137 55fbd22a-6204-0410-b2f0-b6c764c7e90a committer: jamesbunton --- src/ft.py | 8 ++++++-- src/lang.py | 12 ++++++------ src/legacy/glue.py | 2 +- src/tlib/msn/msn.py | 3 +-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/ft.py b/src/ft.py index 86fd3d1..756d3bf 100644 --- a/src/ft.py +++ b/src/ft.py @@ -49,7 +49,9 @@ class FTSend: self.filesize = filesize if not checkSizeOk(self.filesize): LogEvent(INFO, session.jabberID, "File too large.") - session.legacycon.sendMessage(to, "", lang.get(session.lang).msnFtSizeRejected % (self.filename, config.ftSizeLimit, config.website), True) + text = lang.get(session.lang).msnFtSizeRejected % (self.filename, config.ftSizeLimit, config.website) + session.legacycon.sendMessage(to, "", text, True) + session.sendMessage(to=session.jabberID, fro=to, body=text) self.reject() return @@ -135,7 +137,9 @@ class FTReceive: if not checkSizeOk(legacyftp.filesize): LogEvent(INFO, session.jabberID, "File too large.") legacyftp.reject() - session.legacycon.sendMessage(senderJID, "", lang.get(session.lang).msnFtSizeRejected % (legacyftp.filename, config.ftSizeLimit, config.website), False) + text = lang.get(session.lang).msnFtSizeRejected % (legacyftp.filename, config.ftSizeLimit, config.website) + session.legacycon.sendMessage(senderJID, "", text, False) + session.sendMessage(to=session.jabberID, fro=senderJID, body=text) return self.session = session self.toJID = self.session.jabberID + "/" + self.session.highestResource() diff --git a/src/lang.py b/src/lang.py index 9ad46d1..fd31c11 100644 --- a/src/lang.py +++ b/src/lang.py @@ -42,7 +42,7 @@ class strings: msnRealtimeMail = u"Hotmail notification\n\nFrom: %s <%s>\n Subject: %s" msnDisconnected = u"Disconnected from MSN servers: %s" msnConnectFailed = u"Failed to connect to MSN servers: %s" - msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s. To send larger files to this person, please use Jabber. See %s for details." + msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s bytes. To exchange larger files to this person, please use Jabber. See %s for details." command_CommandList = u"PyMSNt Commands" command_Done = "Command completed." @@ -89,7 +89,7 @@ class strings: msnRealtimeMail = u"Hotmail notification\n\nFrom: %s <%s>\n Subject: %s" msnDisconnected = u"Desligado dos servidores MSN: %s" msnConnectFailed = u"Failed to connect to MSN servers: %s" - msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s. To send larger files to this person, please use Jabber. See %s for details." + msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s bytes. To exchange larger files to this person, please use Jabber. See %s for details." command_CommandList = u"PyMSNt Commands" command_Done = "Command completed." @@ -179,7 +179,7 @@ class strings: msnRealtimeMail = u"Hotmail notification\n\nNeue Nachricht von %s <%s>\n Subject: %s" msnDisconnected = u"Die Verbindung zum MSN-Server wurde getrennt: %s" msnConnectFailed = u"Failed to connect to MSN servers: %s" - msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s. To send larger files to this person, please use Jabber. See %s for details." + msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s bytes. To exchange larger files to this person, please use Jabber. See %s for details." command_CommandList = u"PyMSNt Commands" command_Done = "Command completed." @@ -223,7 +223,7 @@ class strings: msnRealtimeMail = u"Notification Hotmail\n\nDe: %s <%s>\n Sujet: %s" msnDisconnected = u"Déconnecté du serveur MSN: %s" msnConnectFailed = u"Failed to connect to MSN servers: %s" - msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s. To send larger files to this person, please use Jabber. See %s for details." + msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s bytes. To exchange larger files to this person, please use Jabber. See %s for details." command_CommandList = u"Commandes PyMSNt" command_Done = "Command completed." @@ -272,7 +272,7 @@ class strings: msnRealtimeMail = u"Notificación de Hotmail\n\nDe: %s <%s>\nAsunto: %s" msnDisconnected = u"Desconexión de los servidores MSN: %s" msnConnectFailed = u"Failed to connect to MSN servers: %s" - msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s. To send larger files to this person, please use Jabber. See %s for details." + msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s bytes. To exchange larger files to this person, please use Jabber. See %s for details." command_CommandList = u"PyMSNt Commands" command_Done = "Command completed." @@ -334,7 +334,7 @@ class strings: msnRealtimeMail = u"Powiadomienie Hotmail\n\nOd: %s <%s>\n Temat: %s" msnDisconnected = u"Rozłączenie z sieci MSN: %s" msnConnectFailed = u"Failed to connect to MSN servers: %s" - msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s. To send larger files to this person, please use Jabber. See %s for details." + msnFtSizeRejected = u"A file '%s' was rejected because it was over the size limit of %s bytes. To exchange larger files to this person, please use Jabber. See %s for details." command_CommandList = u"Polecenia PyMSNt" command_Done = "Polecenie zakończone." diff --git a/src/legacy/glue.py b/src/legacy/glue.py index d9dbdd1..0ba47b4 100644 --- a/src/legacy/glue.py +++ b/src/legacy/glue.py @@ -127,7 +127,7 @@ def jid2msn(jid): msnid = jid2msn_cache[jid] return msnid else: - if jid.index("%tel@") > 0: + if jid.find("%tel@") > 0: jid = "tel:+" + jid.replace("%tel@", "@") msnid = unicode(jid[:jid.find('@')].replace('%', '@')).split("/")[0] jid2msn_cache[jid] = msnid diff --git a/src/tlib/msn/msn.py b/src/tlib/msn/msn.py index 66e3af8..bcc9aaa 100644 --- a/src/tlib/msn/msn.py +++ b/src/tlib/msn/msn.py @@ -847,9 +847,8 @@ class MSNEventBase(LineReceiver): self.setLineMode(extra) return except Exception, e: - log.msg("Traceback - ERROR in checkMessage: " + str(e)) self.setLineMode(extra) - return + raise self.gotMessage(m) self.setLineMode(extra) -- 2.39.2