Changeset 7e68015 for protocols


Ignore:
Timestamp:
2016-01-21T06:15:44Z (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/message.c

    r82cb190 r7e68015  
    2727{
    2828        struct im_connection *ic = data;
    29         struct jabber_data *jd = ic->proto_data;
    3029        char *from = xt_find_attr(node, carbons_sent ? "to" : "from");
    3130        char *type = xt_find_attr(node, "type");
     
    3837        if (!from) {
    3938                return XT_HANDLED; /* Consider this packet corrupted. */
    40         }
    41 
    42         /* try to detect hipchat's own version of self-messages */
    43         if (jd->flags & JFLAG_HIPCHAT) {
    44                 struct xt_node *c;
    45 
    46                 if ((c = xt_find_node_by_attr(node->children, "delay", "xmlns", XMLNS_DELAY)) &&
    47                     (s = xt_find_attr(c, "from_jid")) &&
    48                     jabber_compare_jid(s, jd->me)) {
    49                         carbons_sent = TRUE;
    50                 }
    5139        }
    5240
  • protocols/jabber/presence.c

    r82cb190 r7e68015  
    222222        cap = xt_new_node("c", NULL, NULL);
    223223        xt_add_attr(cap, "xmlns", XMLNS_CAPS);
    224 
    225         if (jd->flags & JFLAG_HIPCHAT) {
    226                 /* hipchat specific node, whitelisted by request to receive self-messages */
    227                 xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps/hipchat");
    228         } else {
    229                 xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
    230         }
     224        xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
    231225        xt_add_attr(cap, "ver", BITLBEE_VERSION);   /* The XEP wants this hashed, but nobody's doing that. */
    232226        xt_add_child(node, cap);
Note: See TracChangeset for help on using the changeset viewer.