Changeset 7e68015 for protocols/jabber

Timestamp:

2016-01-21T06:15:44Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1239d05

Parents:

82cb190

Message:

Revert "hipchat: Implement their own variant of self-messages [...]"

This reverts commit d11ccbf6ea94264bde8b0f525c4bbedf50de0174.

After thinking about this long enough I've decided this is a bad idea,
and better wait for the hipchat server to support carbons.

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");
@@ -38 +37 @@
         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);
-
-        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, "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);