Changeset 1444be5

Timestamp:

2012-10-17T07:23:00Z (12 years ago)

Author:

Michael Stapelberg <michael@…>

Branches:

master

Children:

91ae87d

Parents:

13df515

Message:

Implement jabber message receipts (XEP-0184)

This change will make BitlBee acknowledge messages when requested.
It will not request message receipts from other clients, mainly because I am
not sure if this feature can be mapped to IRC cleanly.

Location:

protocols/jabber

Files:

• iq.c (modified) (1 diff)
• jabber.h (modified) (1 diff)
• message.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -128 +128 @@
                                                    XMLNS_MUC,
                                                    XMLNS_PING,
+                                                   XMLNS_RECEIPTS,
                                                    XMLNS_SI,
                                                    XMLNS_BYTESTREAMS,

protocols/jabber/jabber.h

@@ -227 +227 @@
 #define XMLNS_TIME         "urn:xmpp:time"                                       /* XEP-0202 */
 #define XMLNS_PING         "urn:xmpp:ping"                                       /* XEP-0199 */
+#define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
 #define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
 #define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */

protocols/jabber/message.c

@@ -24 +24 @@
 #include "jabber.h"
 
+static unsigned int next_receipt_id = 1;
+
 xt_status jabber_pkt_message( struct xt_node *node, gpointer data )
 {
         struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         char *from = xt_find_attr( node, "from" );
         char *type = xt_find_attr( node, "type" );
+        char *id = xt_find_attr( node, "id" );
         struct xt_node *body = xt_find_node( node->children, "body" ), *c;
+        struct xt_node *request = xt_find_node( node->children, "request" );
+        struct xt_node *received, *receipt;
         struct jabber_buddy *bud = NULL;
         char *s, *room = NULL, *reason = NULL;
@@ -35 +41 @@
         if( !from )
                 return XT_HANDLED; /* Consider this packet corrupted. */
+
+        if( request && id )
+        {
+                /* Send a message receipt (XEP-0184), looking like this:
+                 * <message
+                 *  from='kingrichard@royalty.england.lit/throne'
+                 *  id='bi29sg183b4v'
+                 *  to='northumberland@shakespeare.lit/westminster'>
+                 *  <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
+                 * </message> */
+                received = xt_new_node( "received", NULL, NULL );
+                xt_add_attr( received, "xmlns", XMLNS_RECEIPTS );
+                xt_add_attr( received, "id", id );
+                receipt = jabber_make_packet( "message", NULL, from, received );
+                xt_add_attr( receipt, "from", jd->me );
+
+                char *id = g_strdup_printf( "%sRCPT%05x", JABBER_PACKET_ID, ( next_receipt_id++ ) & 0xfffff );
+                xt_add_attr( receipt, "id", id );
+                g_free( id );
+
+                jabber_write_packet( ic, receipt );
+                xt_free_node( receipt );
+        }
         
         bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT );