Changeset 9763

Timestamp:

06/07/08 21:47:19 (6 months ago)

Author:

js

Message:

Initial XEP-0184 support.

TODO:

• Implement section 5.
• Think of a way to show in GUI

Possible way: Grey out the sent msg until we receive a <received/>,
but only if we know the other end supports XEP-0184.

• Maybe implement section 6?

Location:

trunk/src/common

Files:

• config.py (modified) (1 diff)
• connection_handlers.py (modified) (1 diff)
• connection.py (modified) (2 diffs)

trunk/src/common/config.py

@@ -312 +312 @@
                         'zeroconf_email': [ opt_str, '', '', True ],
                         'use_env_http_proxy' : [opt_bool, False],
+                        'answer_receipt' : [opt_bool, True],
+                        'request_receipt' : [opt_bool, True],
                         'otr_flags': [opt_int, 58 ],
                         'publish_mood': [opt_bool, True],

trunk/src/common/connection_handlers.py

@@ -1694 +1694 @@
                 encrypted = False
                 xep_200_encrypted = msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO)
+                
+                # Receipt requested
+                if msg.getTag('request', namespace='urn:xmpp:receipts') and \
+                gajim.config.get_per('accounts', self.name, 'answer_receipt'):
+                        receipt = common.xmpp.Message(to = jid, typ = 'chat')
+                        receipt.setID(msg.getID())
+                        receipt.setTag('received',
+                                namespace='urn:xmpp:receipts')
+                        receipt.setThread(thread_id)
+                        con.send(receipt)
 
                 # We don't trust libotr, that's why we only pass the message

trunk/src/common/connection.py

@@ -1124 +1124 @@
                         addresses.addChild('address', attrs = {'type': 'ofrom',
                                 'jid': forward_from})
+
+                # TODO: We should also check if the other end supports it
+                #       as XEP 0184 says checking is a SHOULD. Maybe we should
+                #       implement section 6 of the XEP as well?
+                if msgtxt and gajim.config.get_per('accounts', self.name,
+                'request_receipt'):
+                        msg_iq.setTag('request', namespace='urn:xmpp:receipts')
+
                 if session:
                         # XEP-0201
@@ -1132 +1140 @@
                         if session.enable_encryption:
                                 msg_iq = session.encrypt_stanza(msg_iq)
-
 
                 self.connection.send(msg_iq)