Changeset d11ccbf for protocols

Timestamp:

2015-12-16T15:35:04Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

ea39049

Parents:

3a620ff

git-author:

dequis <dx@…> (23-11-15 22:09:39)

git-committer:

dequis <dx@…> (16-12-15 15:35:04)

Message:

hipchat: Implement their own variant of self-messages (not working yet)

Reuses part of the carbons code, but it's not like it at all.

To be able to receive these messages at all, a different cap node
whitelisted by them is required. I could have used one of the official
clients, but let's try to get things done the right way.

This will start working once they make that change in their servers,
right now this is still in their ticket backlog. I'm merging this now
because it's harmless and nice to have as part of the upcoming release.

Location:

protocols/jabber

Files:

• message.c (modified) (2 diffs)
• presence.c (modified) (1 diff)

protocols/jabber/message.c

@@ -27 +27 @@
 {
         struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         char *from = xt_find_attr(node, carbons_sent ? "to" : "from");
         char *type = xt_find_attr(node, "type");
@@ -37 +38 @@
         if (!from) {
                 return XT_HANDLED; /* Consider this packet corrupted. */
+        }
+
+        /* try to detect hipchat's own version of self-messages */
+        if (jd->flags & JFLAG_HIPCHAT) {
+                struct xt_node *c;
+
+                if ((c = xt_find_node_by_attr(node->children, "delay", "xmlns", XMLNS_DELAY)) &&
+                    (s = xt_find_attr(c, "from_jid")) &&
+                    jabber_compare_jid(s, jd->me)) {
+                        carbons_sent = TRUE;
+                }
         }
 

protocols/jabber/presence.c

@@ -222 +222 @@
         cap = xt_new_node("c", NULL, NULL);
         xt_add_attr(cap, "xmlns", XMLNS_CAPS);
-        xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
+
+        if (jd->flags & JFLAG_HIPCHAT) {
+                /* hipchat specific node, whitelisted by request to receive self-messages */
+                xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps/hipchat");
+        } else {
+                xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
+        }
         xt_add_attr(cap, "ver", BITLBEE_VERSION);   /* The XEP wants this hashed, but nobody's doing that. */
         xt_add_child(node, cap);