Changeset 3fbce97 for protocols/jabber/message.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/jabber/message.c (modified) (5 diffs)

protocols/jabber/message.c

@@ -24 +24 @@
 #include "jabber.h"
 
-xt_status jabber_pkt_message(struct xt_node *node, gpointer data)
+static xt_status jabber_pkt_message_normal(struct xt_node *node, gpointer data, gboolean carbons_sent)
 {
         struct im_connection *ic = data;
-        char *from = xt_find_attr(node, "from");
+        struct jabber_data *jd = ic->proto_data;
+        char *from = xt_find_attr(node, carbons_sent ? "to" : "from");
         char *type = xt_find_attr(node, "type");
         char *id = xt_find_attr(node, "id");
@@ -37 +38 @@
         if (!from) {
                 return XT_HANDLED; /* Consider this packet corrupted. */
-
-        }
-        if (request && id) {
+        }
+
+        /* 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;
+                }
+        }
+
+        if (request && id && g_strcmp0(type, "groupchat") != 0 && !carbons_sent) {
                 /* Send a message receipt (XEP-0184), looking like this:
-                 * <message
-                 *  from='kingrichard@royalty.england.lit/throne'
-                 *  id='bi29sg183b4v'
-                 *  to='northumberland@shakespeare.lit/westminster'>
+                 * <message from='...' id='...' to='...'>
                  *  <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
-                 * </message> */
+                 * </message>
+                 *
+                 * MUC messages are excluded, since receipts aren't supposed to be sent over MUCs
+                 * (XEP-0184 section 5.3) and replying to those may result in 'forbidden' errors.
+                 */
                 struct xt_node *received, *receipt;
 
@@ -127 +140 @@
                 if (fullmsg->len > 0) {
                         imcb_buddy_msg(ic, from, fullmsg->str,
-                                       0, jabber_get_timestamp(node));
+                                       carbons_sent ? OPT_SELFMESSAGE : 0, jabber_get_timestamp(node));
                 }
                 if (room) {
@@ -136 +149 @@
 
                 /* Handling of incoming typing notifications. */
-                if (bud == NULL) {
-                        /* Can't handle these for unknown buddies. */
+                if (bud == NULL || carbons_sent) {
+                        /* Can't handle these for unknown buddies.
+                           And ignore them if it's just carbons */
                 } else if (xt_find_node(node->children, "composing")) {
                         bud->flags |= JBFLAG_DOES_XEP85;
                         imcb_buddy_typing(ic, from, OPT_TYPING);
                 }
-                /* No need to send a "stopped typing" signal when there's a message. */
-                else if (xt_find_node(node->children, "active") && (body == NULL)) {
+                else if (xt_find_node(node->children, "active")) {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing(ic, from, 0);
+
+                        /* No need to send a "stopped typing" signal when there's a message. */
+                        if (body == NULL) {
+                                imcb_buddy_typing(ic, from, 0);
+                        }
                 } else if (xt_find_node(node->children, "paused")) {
                         bud->flags |= JBFLAG_DOES_XEP85;
@@ -158 +175 @@
         return XT_HANDLED;
 }
+
+static xt_status jabber_carbons_message(struct xt_node *node, gpointer data)
+{
+        struct im_connection *ic = data;
+        struct xt_node *wrap, *fwd, *msg;
+        gboolean carbons_sent;
+
+        if ((wrap = xt_find_node(node->children, "received"))) {
+                carbons_sent = FALSE;
+        } else if ((wrap = xt_find_node(node->children, "sent"))) {
+                carbons_sent = TRUE;
+        }
+
+        if (wrap == NULL || g_strcmp0(xt_find_attr(wrap, "xmlns"), XMLNS_CARBONS) != 0) {
+                return XT_NEXT;
+        }
+
+        if (!(fwd = xt_find_node(wrap->children, "forwarded")) ||
+             (g_strcmp0(xt_find_attr(fwd, "xmlns"), XMLNS_FORWARDING) != 0) ||
+            !(msg = xt_find_node(fwd->children, "message"))) {
+                imcb_log(ic, "Error: Invalid carbons message received");
+                return XT_ABORT;
+        }
+
+        return jabber_pkt_message_normal(msg, data, carbons_sent);
+}
+
+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");
+
+        if (jabber_compare_jid(jd->me, from)) {    /* Probably a Carbons message */
+                xt_status st = jabber_carbons_message(node, data);
+                if (st == XT_HANDLED || st == XT_ABORT) {
+                        return st;
+                }
+        }
+        return jabber_pkt_message_normal(node, data, FALSE);
+}