copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

moved receipt handling after XEP 0200 decryption

Browse source
This commit is contained in:
Brendan Taylor 2008-07-14 00:25:53 +00:00
parent 095d5b2fef
commit c24041a0df
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/common/connection_handlers.py
View file

@ -1661,23 +1661,6 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
encrypted = False encrypted = False
xep_200_encrypted = msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO) xep_200_encrypted = msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO)
# Receipt requested
# TODO: We shouldn't answer if we're invisible!
contact = gajim.contacts.get_contact(self.name,
common.gajim.get_room_and_nick_from_fjid(frm)[0])
if msg.getTag('request', namespace=common.xmpp.NS_RECEIPTS) \
and gajim.config.get_per('accounts', self.name,
'answer_receipts') and contact and contact.sub \
not in (u'to', u'none'):
receipt = common.xmpp.Message(to = jid, typ = 'chat')
receipt.setID(msg.getID())
receipt.setTag('received',
namespace='urn:xmpp:receipts')
if thread_id:
receipt.setThread(thread_id)
con.send(receipt)
if mtype != 'groupchat': if mtype != 'groupchat':
session = self.get_or_create_session(frm, thread_id) session = self.get_or_create_session(frm, thread_id)
@ -1729,6 +1712,23 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
except: except:
self.dispatch('FAILED_DECRYPT', (frm, tim, session)) self.dispatch('FAILED_DECRYPT', (frm, tim, session))
# Receipt requested
# TODO: We shouldn't answer if we're invisible!
contact = gajim.contacts.get_contact(self.name,
common.gajim.get_room_and_nick_from_fjid(frm)[0])
if msg.getTag('request', namespace=common.xmpp.NS_RECEIPTS) \
and gajim.config.get_per('accounts', self.name,
'answer_receipts') and contact and contact.sub \
not in (u'to', u'none'):
receipt = common.xmpp.Message(to = jid, typ = 'chat')
receipt.setID(msg.getID())
receipt.setTag('received',
namespace='urn:xmpp:receipts')
if thread_id:
receipt.setThread(thread_id)
con.send(receipt)
addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS) addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS)
# Be sure it comes from one of our resource, else ignore address element # Be sure it comes from one of our resource, else ignore address element